陶汉栋 / ParentWork

26 Mar, 2018

5 commits

183c91ed no message Browse Dir »

陶汉栋
2018-03-26 10:21:07 +0800
b0bddad4 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-26 10:20:17 +0800
325cb7bb Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

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

张道锋
2018-03-26 10:08:18 +0800
a4ba63a7 no message Browse Dir »

张道锋
2018-03-26 10:07:59 +0800

24 Mar, 2018

2 commits

e456fe36 Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	.idea/modules.xml
```
姚旭斌
2018-03-24 09:43:47 +0800
8d78127a no message Browse Dir »

姚旭斌
2018-03-24 09:43:02 +0800

23 Mar, 2018

2 commits

d106d2db Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/src/main/AndroidManifest.xml
```
姚旭斌
2018-03-23 16:19:57 +0800
abf181bd no message Browse Dir »

张道锋
2018-03-23 16:01:44 +0800

22 Mar, 2018

1 commit

50ca3597 no message Browse Dir »

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

21 Mar, 2018

2 commits

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

陶汉栋
2018-03-21 09:52:55 +0800
10a30b8e no message Browse Dir »

姚旭斌
2018-03-21 09:23:27 +0800

20 Mar, 2018

2 commits

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

19 Mar, 2018

7 commits

2c964317 no message Browse Dir »

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

陶汉栋
2018-03-19 14:39:06 +0800

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

# Conflicts:
#	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
#	app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
#	app/src/main/res/layout/activity_web_view.xml

2018-03-19 14:22:43 +0800