Merge branch 'newpath'

# Conflicts:
#	app/src/main/java/com/dahe/examine/base/App.java
This commit is contained in:
lijia 2024-11-21 11:21:53 +08:00
commit edb44f8983

View File

@ -26,7 +26,7 @@ public class App extends Application {
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
System.out.println("我是master2"); System.out.println("我是新分支");
mApplication = this; mApplication = this;
System.out.println("我是主分支修改"); System.out.println("我是主分支修改");
CommonBaseLibrary.getInstance().init(this, Api.BASE_URL); CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);