陶汉栋 / 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

5 commits

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
50ca3597 no message Browse Dir »

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

21 Mar, 2018

2 commits

d045d156 Merge branch 'developer' into yxb_dev Browse Dir »

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

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

20 Mar, 2018

2 commits

69e40270 Merge branch 'developer' into yxb_dev Browse Dir »

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

陶汉栋
2018-03-20 10:49:16 +0800

17 Mar, 2018

1 commit

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

16 Mar, 2018

4 commits

b9b5e32e Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java
```
姚旭斌
2018-03-16 17:47:29 +0800
bfc68ef2 no message Browse Dir »

陶汉栋
2018-03-16 17:28:06 +0800
bcb57ba9 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-16 09:07:41 +0800
b808b918 no message Browse Dir »

陶汉栋
2018-03-16 08:24:03 +0800

15 Mar, 2018

3 commits

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

姚旭斌
2018-03-15 17:35:29 +0800
675bd555 no message Browse Dir »

陶汉栋
2018-03-15 17:24:56 +0800
3163a156 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-03-15 08:20:51 +0800

14 Mar, 2018

1 commit

de62641e no message Browse Dir »

姚旭斌
2018-03-14 17:02:44 +0800

13 Mar, 2018

1 commit

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