陶汉栋 / ParentWork

20 Mar, 2018

5 commits

6a922153 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »

陶汉栋
2018-03-20 14:40:50 +0800
e80f1b4f no message Browse File »

姚旭斌
2018-03-20 13:59:31 +0800
69e40270 Merge branch 'developer' into yxb_dev Browse File »

姚旭斌
2018-03-20 11:32:10 +0800
0d40485b no message Browse File »

陶汉栋
2018-03-20 10:49:16 +0800
6b5379b8 no message Browse File »

陶汉栋
2018-03-20 10:30:59 +0800

19 Mar, 2018

2 commits

d64a8879 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »

张道锋
2018-03-19 13:26:00 +0800

2181568b Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/shunzhi/parent/AppConfig.java
#	app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
#	app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java
#	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
#	app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java

2018-03-19 11:34:34 +0800

17 Mar, 2018

2 commits

c84d485d Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »
```
# Conflicts:
#	app/src/main/AndroidManifest.xml
```
张道锋
2018-03-17 17:34:49 +0800
f307b0dd no message Browse File »

姚旭斌
2018-03-17 10:33:19 +0800

16 Mar, 2018

4 commits

ad89d180 Merge branch 'developer' into yxb_dev ... Browse File »

# Conflicts:
#	app/src/main/java/com/shunzhi/parent/AppConfig.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java

2018-03-16 17:17:57 +0800