xjq #14

Open
pgo4rwty6 wants to merge 2 commits from xujiaqing_branch into develop
Collaborator

1

1
pgo4rwty6 added 5 commits 2 years ago
This pull request has changes conflicting with the target branch.
src/AndroidStudio_projects/app/src/main/java/com/example/hamburger/register.java
src/AndroidStudio_projects/app/libs/mysql-connector-java-5.1.49.jar
src/AndroidStudio_projects/app/src/androidTest/java/com/example/hamburger/ExampleInstrumentedTest.java
src/AndroidStudio_projects/app/src/main/java/com/example/hamburger/entity/IsolationUser.java
src/AndroidStudio_projects/app/src/main/java/com/example/hamburger/entity/User.java
src/AndroidStudio_projects/app/src/main/java/com/example/hamburger/ui/home/Inform_input.java
src/AndroidStudio_projects/app/src/androidTest/java/com/example/hamburger/Mtest.java
src/AndroidStudio_projects/app/src/main/java/com/example/hamburger/MainActivity.java
src/AndroidStudio_projects/app/src/main/java/com/example/hamburger/MainActivity2.java
src/AndroidStudio_projects/app/src/main/java/com/example/hamburger/dao/UserDao.java
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No project
No Assignees
1 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: pmie756yv/Smart#14
Loading…
There is no content yet.