26 Mar, 2018

5 commits

• 38b93710   no message Browse File »
  陶汉栋

  2018-03-26 13:07:21 +0800  
• b0bddad4   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

  2018-03-26 10:20:17 +0800  
• 325cb7bb   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-26 10:17:23 +0800  
• 8c9c3f09   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  张道锋

  2018-03-26 10:08:18 +0800  
• a4ba63a7   no message Browse File »
  张道锋

  2018-03-26 10:07:59 +0800  

24 Mar, 2018

5 commits

• 5a577c2a   Merge branch 'developer' into yxb_dev ... Browse File »

  # Conflicts:
  #	app/src/main/AndroidManifest.xml
  #	app/src/main/res/layout/activity_personinfo.xml
  #	app/src/main/res/layout/fragment_mine.xml

  姚旭斌

  2018-03-24 17:42:54 +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  
• 85477cb5   no message Browse File »
  陶汉栋

  2018-03-24 17:04:57 +0800  
• d4f3a486   no message Browse File »
  姚旭斌

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

  2018-03-24 12:33:28 +0800  

23 Mar, 2018

3 commits

• 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  
• abf181bd   no message Browse File »
  张道锋

  2018-03-23 16:01:44 +0800  

22 Mar, 2018

1 commit

• 50ca3597   no message Browse File »
  张道锋

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

21 Mar, 2018

2 commits

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

  2018-03-21 15:26:55 +0800  
• c169928b   no message Browse File »
  陶汉栋

  2018-03-21 09:59:39 +0800  

20 Mar, 2018

3 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  
• b8df71fe   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »

  # 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

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

  2018-03-19 14:14:35 +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  

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  
• 26d17696   no message Browse File »
  姚旭斌

  2018-03-17 17:27:50 +0800  
• c9426721   Merge branch 'developer' into yxb_dev ... Browse File »

  # 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  

16 Mar, 2018

8 commits

• dec4c9a0   no message Browse File »
  姚旭斌

  2018-03-16 23:04:48 +0800  
• 2e8868cb   no message Browse File »
  陶汉栋

  2018-03-16 18:00:03 +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  
• ad89d180   Merge branch 'developer' into yxb_dev ... Browse File »

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

  姚旭斌

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

  2018-03-16 17:16:05 +0800  
• 378663ec   no message Browse File »
  陶汉栋

  2018-03-16 13:29:22 +0800  

15 Mar, 2018

3 commits

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

  2018-03-15 17:32:04 +0800  
• df6597cd   no message Browse File »
  姚旭斌

  2018-03-15 17:02:38 +0800  
• 3163a156   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-15 08:20:51 +0800  

14 Mar, 2018

1 commit

• de62641e   no message Browse File »
  姚旭斌

  2018-03-14 17:02:44 +0800  

09 Mar, 2018

2 commits

• 59f55e6b   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev ... Browse File »

  # Conflicts:
  #	app/src/main/res/values/colors.xml

  姚旭斌

  2018-03-09 15:33:28 +0800  
• 5ade1fb7   no message Browse File »
  陶汉栋

  2018-03-09 13:15:15 +0800