陶汉栋 / ParentWork

23 Mar, 2018

1 commit

ec9c6c5d Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »
```
# Conflicts:
#	app/src/main/AndroidManifest.xml
```
张道锋
2018-03-23 16:03:39 +0800

22 Mar, 2018

11 commits

ee0f03b1 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-22 18:17:38 +0800
ae9a2c2f no message Browse Dir »

陶汉栋
2018-03-22 16:51:54 +0800
05344cfa no message Browse Dir »

陶汉栋
2018-03-22 16:29:00 +0800
57dfbdb6 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-22 15:53:45 +0800
432b4257 no message Browse Dir »

陶汉栋
2018-03-22 15:36:10 +0800
de5c40dd Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
#	app/src/main/res/layout/fragment_mine.xml
```
姚旭斌
2018-03-22 12:30:21 +0800
49d6fe65 no message Browse Dir »

陶汉栋
2018-03-22 11:39:15 +0800
2a83582a no message Browse Dir »

姚旭斌
2018-03-22 11:37:04 +0800
50ca3597 no message Browse Dir »

张道锋
2018-03-22 11:06:39 +0800
7fa6a0f8 no message Browse Dir »

姚旭斌
2018-03-22 09:52:12 +0800
9b095404 no message Browse Dir »

陶汉栋
2018-03-22 09:51:22 +0800

21 Mar, 2018

7 commits

3909048b no message Browse Dir »

姚旭斌
2018-03-21 17:03:10 +0800
fbd004dd Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-21 16:41:47 +0800
2f0e5240 no message Browse Dir »

陶汉栋
2018-03-21 15:45:26 +0800
ec30fab4 no message Browse Dir »

陶汉栋
2018-03-21 15:43:34 +0800
d045d156 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-21 15:26:55 +0800
d7705ead no message Browse Dir »

姚旭斌
2018-03-21 15:26:40 +0800
8c263840 no message Browse Dir »

陶汉栋
2018-03-21 14:42:38 +0800

20 Mar, 2018

19 commits

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

陶汉栋
2018-03-20 17:55:33 +0800
b8de588f no message Browse Dir »

姚旭斌
2018-03-20 17:48:04 +0800
9ffe80e9 no message Browse Dir »

陶汉栋
2018-03-20 17:33:35 +0800
9ef200d2 no message Browse Dir »

陶汉栋
2018-03-20 17:26:09 +0800

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

81d7f8c8 no message Browse Dir »

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

陶汉栋
2018-03-20 16:51:55 +0800
6a922153 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

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

陶汉栋
2018-03-20 14:40:19 +0800
d878a8a1 Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java
```
姚旭斌
2018-03-20 14:12:44 +0800
e80f1b4f no message Browse Dir »

姚旭斌
2018-03-20 13:59:31 +0800
95b810ac no message Browse Dir »

陶汉栋
2018-03-20 13:53:43 +0800
69e40270 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-20 11:32:10 +0800
9e6ee8e8 no message Browse Dir »

陶汉栋
2018-03-20 11:23:21 +0800
4378a687 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-03-20 10:50:37 +0800
df8011cd no message Browse Dir »

姚旭斌
2018-03-20 10:50:28 +0800
0d40485b no message Browse Dir »

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

陶汉栋
2018-03-20 10:30:59 +0800
b8df71fe Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »
```
# 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

2 commits

2c964317 no message Browse Dir »

陶汉栋
2018-03-19 18:31:11 +0800
3ad71d87 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

张道锋
2018-03-19 18:04:41 +0800