陶汉栋 / ParentWork

05 May, 2018

1 commit

e3782ee9 no message Browse File »

陶汉栋
2018-05-05 08:04:50 +0800

04 May, 2018

1 commit

20641deb no message Browse File »

姚旭斌
2018-05-04 18:54:17 +0800

27 Mar, 2018

1 commit

4f854ee0 no message Browse File »

张道锋
2018-03-27 16:54:18 +0800

26 Mar, 2018

2 commits

e18ab61a no message Browse File »

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

张道锋
2018-03-26 10:08:18 +0800

24 Mar, 2018

5 commits

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

陶汉栋
2018-03-24 17:43:58 +0800
f6c9454a no message Browse File »

姚旭斌
2018-03-24 17:41:36 +0800
b5c21103 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
```
姚旭斌
2018-03-24 17:32:14 +0800
ca2029b2 no message Browse File »

陶汉栋
2018-03-24 17:18:37 +0800
85477cb5 no message Browse File »

陶汉栋
2018-03-24 17:04:57 +0800

15 Mar, 2018

1 commit

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

1 commit

de62641e no message Browse File »

姚旭斌
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 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

10 Mar, 2018

1 commit

42f6a92a no message Browse File »

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