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  

19 Mar, 2018

7 commits

• 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  
• 190b12d2   no message Browse Dir »
  张道锋

  2018-03-19 13:25:56 +0800  
• d177b23c   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-19 11:24:17 +0800  
• 35f2acad   no message Browse Dir »
  张道锋

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

  2018-03-19 11:19:59 +0800  
• beafeb7e   no message Browse Dir »
  张道锋

  2018-03-19 11:13:40 +0800  

17 Mar, 2018

1 commit

• c84d837b   no message Browse Dir »
  张道锋

  2018-03-17 17:33:53 +0800