20 Mar, 2018

14 commits

• 9ef200d2   no message Browse Dir »
  陶汉栋

  2018-03-20 17:26:09 +0800  
• 0118d641   no message Browse Dir »
  陶汉栋

  2018-03-20 16:51:55 +0800  
• 6a922153   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

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

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

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

  姚旭斌

  2018-03-20 14:12:44 +0800  
• e80f1b4f   no message Browse Dir »
  姚旭斌

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

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

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

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

  2018-03-20 11:23:21 +0800  
• df8011cd   no message Browse Dir »
  姚旭斌

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

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

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

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

  陶汉栋

  2018-03-20 08:29:22 +0800  

19 Mar, 2018

11 commits

• 2c964317   no message Browse Dir »
  陶汉栋

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

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

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

  姚旭斌

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

  2018-03-19 17:29:45 +0800  
• 69c0bf10   no message Browse Dir »
  陶汉栋

  2018-03-19 14:39:01 +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  
• e2485424   no message Browse Dir »
  姚旭斌

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

  2018-03-19 13:26:00 +0800  
• 2b1c9aa3   no message Browse Dir »
  陶汉栋

  2018-03-19 13:07:51 +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  
• ac3c7edc   no message Browse Dir »
  姚旭斌

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

17 Mar, 2018

5 commits

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

  # Conflicts:
  #	app/src/main/AndroidManifest.xml

  张道锋

  2018-03-17 17:34:49 +0800  
• 26d17696   no message Browse Dir »
  姚旭斌

  2018-03-17 17:27:50 +0800  
• de0d72ae   no message Browse Dir »
  姚旭斌

  2018-03-17 10:35:56 +0800  
• c9426721   Merge branch 'developer' into yxb_dev ... Browse Dir »

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

  姚旭斌

  2018-03-17 10:34:37 +0800  
• f307b0dd   no message Browse Dir »
  姚旭斌

  2018-03-17 10:33:19 +0800  

16 Mar, 2018

10 commits

• dec4c9a0   no message Browse Dir »
  姚旭斌

  2018-03-16 23:04:48 +0800  
• 0a469ad2   no message Browse Dir »
  陶汉栋

  2018-03-16 19:12:57 +0800  
• 6bee8968   no message Browse Dir »
  姚旭斌

  2018-03-16 18:32:29 +0800  
• 2e8868cb   no message Browse Dir »
  陶汉栋

  2018-03-16 18:00:03 +0800  
• 658234ab   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-16 17:57:11 +0800  
• 8510cba8   no message Browse Dir »
  陶汉栋

  2018-03-16 17:55:36 +0800  
• 8f6486da   Merge branch 'developer' into yxb_dev ... Browse Dir »

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

  姚旭斌

  2018-03-16 17:49:37 +0800  
• b9b5e32e   Merge branch 'developer' into yxb_dev ... Browse Dir »

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

  姚旭斌

  2018-03-16 17:47:29 +0800  
• f7a6aa86   no message Browse Dir »
  陶汉栋

  2018-03-16 17:34:00 +0800  
• bfc68ef2   no message Browse Dir »
  陶汉栋

  2018-03-16 17:28:06 +0800