陶汉栋 / ParentWork

26 Mar, 2018

1 commit

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

张道锋
2018-03-26 10:08:18 +0800

24 Mar, 2018

5 commits

f8c93dce Merge branch 'developer' into yxb_dev Browse File »

姚旭斌
2018-03-24 18:04:08 +0800
05d042d9 no message Browse File »

陶汉栋
2018-03-24 17:43:35 +0800
aa386a0f Merge branch 'developer' into yxb_dev Browse File »

姚旭斌
2018-03-24 10:54:41 +0800
70b2f9e0 no message Browse File »

陶汉栋
2018-03-24 10:52:43 +0800
e456fe36 Merge branch 'developer' into yxb_dev ... Browse File »
```
# Conflicts:
#	.idea/modules.xml
```
姚旭斌
2018-03-24 09:43:47 +0800

23 Mar, 2018

3 commits

7c993489 no message Browse File »

陶汉栋
2018-03-23 17:45:24 +0800
8176e156 no message Browse File »

陶汉栋
2018-03-23 16:47:02 +0800
d878d22f no message Browse File »

陶汉栋
2018-03-23 16:03:37 +0800

22 Mar, 2018

1 commit

50ca3597 no message Browse File »

张道锋
2018-03-22 11:06:39 +0800

20 Mar, 2018

4 commits

9ffe80e9 no message Browse File »

陶汉栋
2018-03-20 17:33:35 +0800
81d7f8c8 no message Browse File »

姚旭斌
2018-03-20 17:12:23 +0800
0118d641 no message Browse File »

陶汉栋
2018-03-20 16:51:55 +0800
b8df71fe Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »
```
# Conflicts:
#	.idea/modules.xml
#	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
```
陶汉栋
2018-03-20 08:29:22 +0800

19 Mar, 2018

3 commits

e71dbb40 no message Browse File »

姚旭斌
2018-03-19 17:29:45 +0800
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