Merge branch 'newpath'

# Conflicts: # app/src/main/java/com/dahe/examine/base/App.java
2024-11-21 11:21:53 +08:00 · 2024-11-21 11:21:53 +08:00 · edb44f8983
commit edb44f8983
parent 65e563b264 a97ddc7527
1 changed files with 1 additions and 1 deletions
--- a/app/src/main/java/com/dahe/examine/base/App.java
+++ b/app/src/main/java/com/dahe/examine/base/App.java
@ -26,7 +26,7 @@ public class App extends Application {
    @Override
    public void onCreate() {
        super.onCreate();
-        System.out.println("我是master2");
+        System.out.println("我是新分支");
        mApplication = this;
        System.out.println("我是主分支修改");
        CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);