Merge remote-tracking branch 'origin/master' into toKotlin

# Conflicts:
#	app/src/main/java/com/dahe/examine/base/App.java
This commit is contained in:
lijia 2022-10-08 09:53:56 +08:00
commit 38b66d2717

View File

@ -26,6 +26,8 @@ public class App extends Application {
@Override
public void onCreate() {
super.onCreate();
System.out.println("我是master");
System.out.println("我是master22");
mApplication = this;
System.out.println("woshikotlin");
CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);