陶汉栋 / ParentWork | GitLab

13 Mar, 2018

6 commits

87ab95b8 Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
```
姚旭斌
2018-03-13 11:19:58 +0800
ffe64e2f no message Browse Dir »

姚旭斌
2018-03-13 11:11:32 +0800
856b277c no message Browse Dir »

姚旭斌
2018-03-13 11:11:27 +0800
5ecc3e8e no message Browse Dir »

陶汉栋
2018-03-13 09:12:25 +0800

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

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
#	app/src/main/res/layout/fragment_report.xml
#	mvpsdk/src/main/java/com/share/mvpsdk/base/activity/BaseCompatActivity.java
#	mvpsdk/src/main/java/com/share/mvpsdk/utils/OkHttpExceptionUtil.java

2018-03-13 08:18:50 +0800

1ca679e0 no message Browse Dir »

陶汉栋
2018-03-13 08:08:35 +0800

12 Mar, 2018

3 commits

91d42621 no message Browse Dir »

姚旭斌
2018-03-12 20:53:51 +0800
4512e826 no message Browse Dir »

姚旭斌
2018-03-12 16:48:20 +0800
bcafe53a no message Browse Dir »

姚旭斌
2018-03-12 11:06:16 +0800

10 Mar, 2018

1 commit

42f6a92a no message Browse Dir »

姚旭斌
2018-03-10 14:40:47 +0800

09 Mar, 2018

14 commits

d8d08286 no message Browse Dir »

姚旭斌
2018-03-09 20:32:40 +0800
37b52cab no message Browse Dir »

姚旭斌
2018-03-09 17:46:12 +0800
9d177f29 no message Browse Dir »

姚旭斌
2018-03-09 17:23:54 +0800
8e86a2dc Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-03-09 17:09:06 +0800
cc09aa55 no message Browse Dir »

陶汉栋
2018-03-09 17:08:43 +0800
abc79afd Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Dir »

姚旭斌
2018-03-09 16:50:50 +0800
751075af no message Browse Dir »

姚旭斌
2018-03-09 16:50:12 +0800
217deceb no message Browse Dir »

陶汉栋
2018-03-09 16:47:59 +0800
96a294c3 no message Browse Dir »

陶汉栋
2018-03-09 16:47:16 +0800
59f55e6b Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/src/main/res/values/colors.xml
```
姚旭斌
2018-03-09 15:33:28 +0800
1ff66eb6 no message Browse Dir »

姚旭斌
2018-03-09 15:31:10 +0800
02540182 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-03-09 13:15:26 +0800
5ade1fb7 no message Browse Dir »

陶汉栋
2018-03-09 13:15:15 +0800
50891b90 no message Browse Dir »

姚旭斌
2018-03-09 11:15:32 +0800

08 Mar, 2018

12 commits

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

姚旭斌
2018-03-08 16:37:57 +0800
69a30786 no message Browse Dir »

姚旭斌
2018-03-08 16:37:54 +0800
564dad4c Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-03-08 16:37:14 +0800
34c57df7 no message Browse Dir »

陶汉栋
2018-03-08 16:37:07 +0800
11f0c65b no message Browse Dir »

姚旭斌
2018-03-08 15:04:47 +0800
a87a6743 no message Browse Dir »

姚旭斌
2018-03-08 13:39:18 +0800
2dec5d36 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-03-08 11:45:15 +0800
6d719af4 no message Browse Dir »

陶汉栋
2018-03-08 11:44:32 +0800
b48d20df no message Browse Dir »

陶汉栋
2018-03-08 11:33:14 +0800
2923e797 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Dir »

姚旭斌
2018-03-08 10:18:23 +0800
f42421de no message Browse Dir »

姚旭斌
2018-03-08 10:18:11 +0800
7485281a Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-03-08 08:22:01 +0800

07 Mar, 2018

4 commits

118e25c4 no message Browse Dir »

姚旭斌
2018-03-07 18:09:29 +0800
23951db3 no message Browse Dir »

陶汉栋
2018-03-07 14:21:01 +0800
180671fd no message Browse Dir »

陶汉栋
2018-03-07 14:20:16 +0800
d8b159ee no message Browse Dir »

姚旭斌
2018-03-07 14:06:12 +0800