24 Mar, 2018

7 commits

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

  2018-03-24 17:43:58 +0800  
• b5c21103   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java

  姚旭斌

  2018-03-24 17:32:14 +0800  
• 8afee2bd   no message Browse File »
  姚旭斌

  2018-03-24 17:31:29 +0800  
• ca2029b2   no message Browse File »
  陶汉栋

  2018-03-24 17:18:37 +0800  
• b4a2cc26   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  姚旭斌

  2018-03-24 14:54:44 +0800  
• 22a74751   no message Browse File »
  姚旭斌

  2018-03-24 12:33:28 +0800  
• e456fe36   Merge branch 'developer' into yxb_dev ... Browse File »

  # Conflicts:
  #	.idea/modules.xml

  姚旭斌

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

23 Mar, 2018

8 commits

• 257465ea   no message Browse File »
  陶汉栋

  2018-03-23 17:46:50 +0800  
• 8176e156   no message Browse File »
  陶汉栋

  2018-03-23 16:47:02 +0800  
• d106d2db   Merge branch 'developer' into yxb_dev ... Browse File »

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

  姚旭斌

  2018-03-23 16:19:57 +0800  
• c5aac4c3   no message Browse File »
  陶汉栋

  2018-03-23 16:06:22 +0800  
• ec9c6c5d   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »

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

  张道锋

  2018-03-23 16:03:39 +0800  
• abf181bd   no message Browse File »
  张道锋

  2018-03-23 16:01:44 +0800  
• 4065e67b   no message Browse File »
  姚旭斌

  2018-03-23 15:37:40 +0800  
• 69679356   no message Browse File »
  陶汉栋

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

22 Mar, 2018

4 commits

• 935f129c   no message Browse File »
  姚旭斌

  2018-03-22 18:17:25 +0800  
• de5c40dd   Merge branch 'developer' into yxb_dev ... Browse File »

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

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

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

21 Mar, 2018

1 commit

• ccad9511   no message Browse File »
  姚旭斌

  2018-03-21 16:41:33 +0800  

20 Mar, 2018

4 commits

• ae079afc   Merge branch 'developer' into yxb_dev ... Browse File »

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

  2018-03-20 16:51:55 +0800  
• 69e40270   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

  2018-03-20 11:32:10 +0800  
• 6b5379b8   no message Browse File »
  陶汉栋

  2018-03-20 10:30:59 +0800  

19 Mar, 2018

5 commits

• e09ea034   Merge branch 'developer' into yxb_dev ... Browse File »

  # 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  
• d64a8879   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  张道锋

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

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

  2018-03-19 11:19:59 +0800  
• 864e9f4c   no message Browse File »
  姚旭斌

  2018-03-19 10:49:05 +0800  

18 Mar, 2018

1 commit

• 8c6d07ed   no message Browse File »
  姚旭斌

  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 File »

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

  张道锋

  2018-03-17 17:34:49 +0800  
• c84d837b   no message Browse File »
  张道锋

  2018-03-17 17:33:53 +0800  
• 26d17696   no message Browse File »
  姚旭斌

  2018-03-17 17:27:50 +0800  

16 Mar, 2018

7 commits

• 658234ab   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

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

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

  # 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 File »

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

  姚旭斌

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

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

  2018-03-16 17:28:06 +0800  
• 2c3dd885   no message Browse File »
  姚旭斌

  2018-03-16 17:16:05 +0800