26 Mar, 2018

11 commits

• e18ab61a   no message Browse Dir »
  陶汉栋

  2018-03-26 17:52:42 +0800  
• 1dec60d7   no message Browse Dir »
  陶汉栋

  2018-03-26 15:34:05 +0800  
• 6cc08955   no message Browse Dir »
  陶汉栋

  2018-03-26 15:30:51 +0800  
• 1ff2fc66   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-26 15:27:18 +0800  
• b932b573   no message Browse Dir »
  姚旭斌

  2018-03-26 15:27:07 +0800  
• 1a085af7   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  张道锋

  2018-03-26 15:25:55 +0800  
• c0619d56   no message Browse Dir »
  陶汉栋

  2018-03-26 15:23:32 +0800  
• 7138f165   no message Browse Dir »
  陶汉栋

  2018-03-26 13:08:17 +0800  
• 38b93710   no message Browse Dir »
  陶汉栋

  2018-03-26 13:07:21 +0800  
• 78184bb7   no message Browse Dir »
  张道锋

  2018-03-26 10:23:30 +0800  
• 8c9c3f09   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  张道锋

  2018-03-26 10:08:18 +0800  

24 Mar, 2018

3 commits

• aa386a0f   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-24 10:54:41 +0800  
• 4b52df23   no message Browse Dir »
  陶汉栋

  2018-03-24 10:25:56 +0800  
• e456fe36   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	.idea/modules.xml

  姚旭斌

  2018-03-24 09:43:47 +0800  

23 Mar, 2018

4 commits

• 7c993489   no message Browse Dir »
  陶汉栋

  2018-03-23 17:45:24 +0800  
• 8176e156   no message Browse Dir »
  陶汉栋

  2018-03-23 16:47:02 +0800  
• 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