陶汉栋 / ParentWork

22 Mar, 2018

1 commit

50ca3597 no message Browse Dir »

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

20 Mar, 2018

2 commits

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

陶汉栋
2018-03-20 14:40:50 +0800
e80f1b4f no message Browse Dir »

姚旭斌
2018-03-20 13:59:31 +0800

19 Mar, 2018

5 commits

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

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

张道锋
2018-03-19 13:26:00 +0800

2181568b 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/AppConfig.java
#	app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
#	app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java
#	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
#	app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java

2018-03-19 11:34:34 +0800

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

陶汉栋
2018-03-19 11:24:17 +0800
beafeb7e no message Browse Dir »

张道锋
2018-03-19 11:13:40 +0800