23 Mar, 2018

5 commits

• c5aac4c3   no message Browse Dir »
  陶汉栋

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

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

  张道锋

  2018-03-23 16:03:39 +0800  
• e56d2f35   no message Browse Dir »
  姚旭斌

  2018-03-23 15:55:12 +0800  
• 4065e67b   no message Browse Dir »
  姚旭斌

  2018-03-23 15:37:40 +0800  
• 0d009088   no message Browse Dir »
  姚旭斌

  2018-03-23 15:37:33 +0800  

22 Mar, 2018

3 commits

• ae9a2c2f   no message Browse Dir »
  陶汉栋

  2018-03-22 16:51:54 +0800  
• 2a83582a   no message Browse Dir »
  姚旭斌

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

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

21 Mar, 2018

2 commits

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

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

  2018-03-21 14:42:38 +0800  

19 Mar, 2018

2 commits

• 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  

17 Mar, 2018

2 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  

16 Mar, 2018

10 commits

• 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  
• ad89d180   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/loginandregistfragment/LoginAndRegistFragment.java

  姚旭斌

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

  2018-03-16 17:16:05 +0800  
• b181dda4   no message Browse Dir »
  陶汉栋

  2018-03-16 13:45:20 +0800  
• a97b79d9   no message Browse Dir »
  姚旭斌

  2018-03-16 13:42:44 +0800  
• 378663ec   no message Browse Dir »
  陶汉栋

  2018-03-16 13:29:22 +0800  
• bcb57ba9   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-16 09:07:41 +0800  
• b808b918   no message Browse Dir »
  陶汉栋

  2018-03-16 08:24:03 +0800  

15 Mar, 2018

5 commits

• c7225026   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Dir »
  姚旭斌

  2018-03-15 17:35:29 +0800  
• 07328347   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-15 17:32:04 +0800  
• 675bd555   no message Browse Dir »
  陶汉栋

  2018-03-15 17:24:56 +0800  
• df6597cd   no message Browse Dir »
  姚旭斌

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

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

14 Mar, 2018

3 commits

• 26d3505e   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev ... Browse Dir »

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

  姚旭斌

  2018-03-14 17:04:29 +0800  
• de62641e   no message Browse Dir »
  姚旭斌

  2018-03-14 17:02:44 +0800  
• 75be5d9a   no message Browse Dir »
  陶汉栋

  2018-03-14 16:49:37 +0800  

13 Mar, 2018

3 commits

• 87ab95b8   Merge branch 'developer' into yxb_dev ... Browse Dir »

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

  姚旭斌

  2018-03-13 11:19:58 +0800  
• 067374b8   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/ui/fragment/ReportFragment.java
  #	app/src/main/res/layout/fragment_report.xml
  #	mvpsdk/src/main/java/com/share/mvpsdk/base/activity/BaseCompatActivity.java
  #	mvpsdk/src/main/java/com/share/mvpsdk/utils/OkHttpExceptionUtil.java

  陶汉栋

  2018-03-13 08:18:50 +0800  
• 1ca679e0   no message Browse Dir »
  陶汉栋

  2018-03-13 08:08:35 +0800  

12 Mar, 2018

2 commits

• 91d42621   no message Browse Dir »
  姚旭斌

  2018-03-12 20:53:51 +0800  
• 4512e826   no message Browse Dir »
  姚旭斌

  2018-03-12 16:48:20 +0800  

10 Mar, 2018

1 commit

• 42f6a92a   no message Browse Dir »
  姚旭斌

  2018-03-10 14:40:47 +0800  

09 Mar, 2018

2 commits

• abc79afd   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Dir »
  姚旭斌

  2018-03-09 16:50:50 +0800  
• 96a294c3   no message Browse Dir »
  陶汉栋

  2018-03-09 16:47:16 +0800