陶汉栋 / ParentWork

18 Mar, 2018

1 commit

8c6d07ed no message Browse File »

姚旭斌
2018-03-18 23:52:58 +0800

17 Mar, 2018

1 commit

26d17696 no message Browse File »

姚旭斌
2018-03-17 17:27:50 +0800

16 Mar, 2018

11 commits

658234ab Merge branch 'developer' into yxb_dev Browse File »

姚旭斌
2018-03-16 17:57:11 +0800
8510cba8 no message Browse File »

陶汉栋
2018-03-16 17:55:36 +0800
8f6486da Merge branch 'developer' into yxb_dev ... Browse File »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/ui/activity/web/WebViewActivity.java
```
姚旭斌
2018-03-16 17:49:37 +0800
b9b5e32e Merge branch 'developer' into yxb_dev ... Browse File »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java
```
姚旭斌
2018-03-16 17:47:29 +0800
f7a6aa86 no message Browse File »

陶汉栋
2018-03-16 17:34:00 +0800
bfc68ef2 no message Browse File »

陶汉栋
2018-03-16 17:28:06 +0800
2c3dd885 no message Browse File »

姚旭斌
2018-03-16 17:16:05 +0800
b181dda4 no message Browse File »

陶汉栋
2018-03-16 13:45:20 +0800
a97b79d9 no message Browse File »

姚旭斌
2018-03-16 13:42:44 +0800
bcb57ba9 Merge branch 'developer' into yxb_dev Browse File »

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

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

15 Mar, 2018

5 commits

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

姚旭斌
2018-03-15 17:35:29 +0800
07328347 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »

陶汉栋
2018-03-15 17:32:04 +0800
675bd555 no message Browse File »

陶汉栋
2018-03-15 17:24:56 +0800
df6597cd no message Browse File »

姚旭斌
2018-03-15 17:02:38 +0800
3163a156 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »

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

14 Mar, 2018

4 commits

8c991655 no message Browse File »

姚旭斌
2018-03-14 20:56:02 +0800
26d3505e Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev ... Browse File »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
```
姚旭斌
2018-03-14 17:04:29 +0800
de62641e no message Browse File »

姚旭斌
2018-03-14 17:02:44 +0800
75be5d9a no message Browse File »

陶汉栋
2018-03-14 16:49:37 +0800

13 Mar, 2018

5 commits

b0b98d12 no message Browse File »

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

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

067374b8 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/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