22 Mar, 2018

6 commits

• 0f4158c7   no message Browse Dir »
  姚旭斌

  2018-03-22 17:03:19 +0800  
• 57dfbdb6   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-22 15:53:45 +0800  
• 432b4257   no message Browse Dir »
  陶汉栋

  2018-03-22 15:36:10 +0800  
• de5c40dd   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
  #	app/src/main/res/layout/fragment_mine.xml

  姚旭斌

  2018-03-22 12:30:21 +0800  
• 49d6fe65   no message Browse Dir »
  陶汉栋

  2018-03-22 11:39:15 +0800  
• 50ca3597   no message Browse Dir »
  张道锋

  2018-03-22 11:06:39 +0800  

21 Mar, 2018

8 commits

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

  2018-03-21 16:41:47 +0800  
• ccad9511   no message Browse Dir »
  姚旭斌

  2018-03-21 16:41:33 +0800  
• 2f0e5240   no message Browse Dir »
  陶汉栋

  2018-03-21 15:45:26 +0800  
• ec30fab4   no message Browse Dir »
  陶汉栋

  2018-03-21 15:43:34 +0800  
• d045d156   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-21 15:26:55 +0800  
• d7705ead   no message Browse Dir »
  姚旭斌

  2018-03-21 15:26:40 +0800  
• 8c263840   no message Browse Dir »
  陶汉栋

  2018-03-21 14:42:38 +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  

20 Mar, 2018

14 commits

• 68baa86d   no message Browse Dir »
  陶汉栋

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

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

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

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

  2018-03-20 10:50:28 +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

12 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  
• d8f68cd8   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-19 14:39:06 +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  
• 2e560dbc   no message Browse Dir »
  张道锋

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

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

  2018-03-19 13:25:56 +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  
• d177b23c   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-19 11:24:17 +0800