20 Mar, 2018

15 commits

• 6a922153   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  陶汉栋

  2018-03-20 14:40:50 +0800  
• c8a5db9f   no message Browse Code »
  陶汉栋

  2018-03-20 14:40:19 +0800  
• d878a8a1   Merge branch 'developer' into yxb_dev ... Browse Code »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java

  姚旭斌

  2018-03-20 14:12:44 +0800  
• dc60ceee   no message Browse Code »
  陶汉栋

  2018-03-20 14:03:09 +0800  
• e80f1b4f   no message Browse Code »
  姚旭斌

  2018-03-20 13:59:31 +0800  
• 95b810ac   no message Browse Code »
  陶汉栋

  2018-03-20 13:53:43 +0800  
• 69e40270   Merge branch 'developer' into yxb_dev Browse Code »
  姚旭斌

  2018-03-20 11:32:10 +0800  
• 173b6348   no message Browse Code »
  姚旭斌

  2018-03-20 11:31:29 +0800  
• 9e6ee8e8   no message Browse Code »
  陶汉栋

  2018-03-20 11:23:21 +0800  
• 4378a687   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  陶汉栋

  2018-03-20 10:50:37 +0800  
• df8011cd   no message Browse Code »
  姚旭斌

  2018-03-20 10:50:28 +0800  
• 0d40485b   no message Browse Code »
  陶汉栋

  2018-03-20 10:49:16 +0800  
• 6b5379b8   no message Browse Code »
  陶汉栋

  2018-03-20 10:30:59 +0800  
• b8df71fe   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Code »

  # Conflicts:
  #	.idea/modules.xml
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java

  陶汉栋

  2018-03-20 08:29:22 +0800  
• 81109726   no message Browse Code »
  陶汉栋

  2018-03-20 08:24:42 +0800  

19 Mar, 2018

24 commits

• 6865d4ae   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  陶汉栋

  2018-03-19 18:31:25 +0800  
• 2c964317   no message Browse Code »
  陶汉栋

  2018-03-19 18:31:11 +0800  
• 3ad71d87   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  张道锋

  2018-03-19 18:04:41 +0800  
• 0e9edef2   no message Browse Code »
  张道锋

  2018-03-19 18:04:37 +0800  
• bb448559   Merge branch 'developer' into yxb_dev ... Browse Code »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java

  姚旭斌

  2018-03-19 17:33:22 +0800  
• e71dbb40   no message Browse Code »
  姚旭斌

  2018-03-19 17:29:45 +0800  
• d8f68cd8   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  陶汉栋

  2018-03-19 14:39:06 +0800  
• 69c0bf10   no message Browse Code »
  陶汉栋

  2018-03-19 14:39:01 +0800  
• e09ea034   Merge branch 'developer' into yxb_dev ... Browse Code »

  # 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  
• e2485424   no message Browse Code »
  姚旭斌

  2018-03-19 14:14:35 +0800  
• 2e560dbc   no message Browse Code »
  张道锋

  2018-03-19 13:55:57 +0800  
• d64a8879   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  张道锋

  2018-03-19 13:26:00 +0800  
• 190b12d2   no message Browse Code »
  张道锋

  2018-03-19 13:25:56 +0800  
• 2b1c9aa3   no message Browse Code »
  陶汉栋

  2018-03-19 13:07:51 +0800  
• 2181568b   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Code »

  # 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 Code »
  陶汉栋

  2018-03-19 11:24:17 +0800  
• e7ab7c8e   no message Browse Code »
  陶汉栋

  2018-03-19 11:24:05 +0800  
• a4167d2d   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  张道锋

  2018-03-19 11:20:51 +0800  
• 35f2acad   no message Browse Code »
  张道锋

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

  2018-03-19 11:19:59 +0800  
• 4478be3f   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Code »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/AppConfig.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java

  陶汉栋

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

  2018-03-19 11:13:40 +0800  
• 864e9f4c   no message Browse Code »
  姚旭斌

  2018-03-19 10:49:05 +0800  
• ac3c7edc   no message Browse Code »
  姚旭斌

  2018-03-19 10:38:42 +0800  

18 Mar, 2018

1 commit

• 8c6d07ed   no message Browse Code »
  姚旭斌

  2018-03-18 23:52:58 +0800