Merge branch 'master' into newlj

# Conflicts:
#	app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java
#	app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java
#	app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
#	build.gradle
This commit is contained in:
2024-12-04 09:28:30 +08:00
14 changed files with 284 additions and 37 deletions
+3
View File
@@ -185,6 +185,9 @@
<activity
android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.AddCarSuccActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.FaceSuccActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.arpa.hndahesudintocctmsdriver.ui.login.LoginActivity"
android:screenOrientation="portrait" />