21 Mar, 2018

6 commits

• 8c263840   no message Browse Dir »
  陶汉栋

  2018-03-21 14:42:38 +0800  
• 7ffbaef3   no message Browse Dir »
  陶汉栋

  2018-03-21 09:59:35 +0800  
• 561e50fc   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-21 09:52:55 +0800  
• 724a75c0   no message Browse Dir »
  陶汉栋

  2018-03-21 09:52:37 +0800  
• 5f67acc0   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java

  姚旭斌

  2018-03-21 09:25:50 +0800  
• 10a30b8e   no message Browse Dir »
  姚旭斌

  2018-03-21 09:23:27 +0800  

20 Mar, 2018

19 commits

• e3be68e6   no message Browse Dir »
  陶汉栋

  2018-03-20 18:02:30 +0800  
• 68baa86d   no message Browse Dir »
  陶汉栋

  2018-03-20 17:59:23 +0800  
• b452c5b0   no message Browse Dir »
  陶汉栋

  2018-03-20 17:55:21 +0800  
• 9ffe80e9   no message Browse Dir »
  陶汉栋

  2018-03-20 17:33:35 +0800  
• 9ef200d2   no message Browse Dir »
  陶汉栋

  2018-03-20 17:26:09 +0800  
• ae079afc   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java
  #	app/src/main/res/layout/activity_consult_two_level.xml
  #	app/src/main/res/layout/fragment_zi_xun.xml

  姚旭斌

  2018-03-20 17:21:41 +0800  
• 81d7f8c8   no message Browse Dir »
  姚旭斌

  2018-03-20 17:12:23 +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  
• dc60ceee   no message Browse Dir »
  陶汉栋

  2018-03-20 14:03:09 +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  
• 9e6ee8e8   no message Browse Dir »
  陶汉栋

  2018-03-20 11:23:21 +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  
• 81109726   no message Browse Dir »
  陶汉栋

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

19 Mar, 2018

11 commits

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

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

  2018-03-19 18:31:11 +0800  
• 0e9edef2   no message Browse Dir »
  张道锋

  2018-03-19 18:04:37 +0800  
• e71dbb40   no message Browse Dir »
  姚旭斌

  2018-03-19 17:29:45 +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  
• 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  
• e7ab7c8e   no message Browse Dir »
  陶汉栋

  2018-03-19 11:24:05 +0800  
• 864e9f4c   no message Browse Dir »
  姚旭斌

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

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

18 Mar, 2018

1 commit

• 8c6d07ed   no message Browse Dir »
  姚旭斌

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

17 Mar, 2018

3 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  
• 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