陶汉栋 / ParentWork

12 Apr, 2018

1 commit

4d51724e no message Browse Dir »

姚旭斌
2018-04-12 11:33:51 +0800

10 Apr, 2018

2 commits

fd11b76f Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-04-10 19:38:31 +0800
0cbb0554 no message Browse Dir »

陶汉栋
2018-04-10 17:24:33 +0800

29 Mar, 2018

3 commits

762b1b1d Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

张道锋
2018-03-29 18:09:40 +0800
e280dc61 no message Browse Dir »

陶汉栋
2018-03-29 14:07:01 +0800
1dffc346 no message Browse Dir »

陶汉栋
2018-03-29 09:32:39 +0800

27 Mar, 2018

1 commit

4f854ee0 no message Browse Dir »

张道锋
2018-03-27 16:54:18 +0800

26 Mar, 2018

3 commits

e18ab61a no message Browse Dir »

陶汉栋
2018-03-26 17:52:42 +0800
38b93710 no message Browse Dir »

陶汉栋
2018-03-26 13:07:21 +0800
8c9c3f09 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

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

24 Mar, 2018

4 commits

5a577c2a Merge branch 'developer' into yxb_dev ... Browse Dir »

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/layout/activity_personinfo.xml
#	app/src/main/res/layout/fragment_mine.xml

2018-03-24 17:42:54 +0800

b5c21103 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
```
姚旭斌
2018-03-24 17:32:14 +0800
85477cb5 no message Browse Dir »

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

23 Mar, 2018

1 commit

8176e156 no message Browse Dir »

陶汉栋
2018-03-23 16:47:02 +0800

22 Mar, 2018

1 commit

50ca3597 no message Browse Dir »

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

20 Mar, 2018

3 commits

ae079afc Merge branch 'developer' into yxb_dev ... Browse Dir »

# Conflicts:
#	app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java
#	app/src/main/res/layout/activity_consult_two_level.xml
#	app/src/main/res/layout/fragment_zi_xun.xml

2018-03-20 17:21:41 +0800