'2023年4月3日09:13:11'

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/MyRetrofit.java

@@ -49,8 +49,8 @@ public class MyRetrofit {
      * 回显地址：222.85.144.89:19002/xxxxxx
      */
 //    private final String BaseUrl = "http://58.16.58.161:19002/ifzt/api/";
-//    private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/"; //接口地址
-    private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/"; //VPN访问请求地址
+    private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/"; //接口地址
+//    private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/"; //VPN访问请求地址
 
     private final String FileUrl = "http://222.85.144.89:19003/ifzt/api/"; //文件服务
     public static final String URL_DOWNLOAD_FILE = "http://192.168.100.63:8087/user-export-excel/";//通行流水下载路径前缀

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/MainActivity.java

@@ -109,12 +109,8 @@ public class MainActivity extends AppActivity implements
     @Override
     protected void initData() {
         init();
-<<<<<<< HEAD
-//        updateApp();
-=======
         updateApp();
         getEnumList();
->>>>>>> 1fcefa0489d8b2e748987512318d3f80fe83b91a
     }
 
     private void updateApp() {

common.gradle

@@ -9,7 +9,7 @@ android {
         // 目标适配版本
         //noinspection OldTargetApi
         targetSdkVersion 30
-        versionName '1.0.4'
+        versionName '1.0.5'
         versionCode 10
     }