23 Mar, 2018

1 commit

• 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  

22 Mar, 2018

5 commits

• ae9a2c2f   no message Browse File »
  陶汉栋

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

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

  2018-03-22 11:06:39 +0800  
• 7fa6a0f8   no message Browse File »
  姚旭斌

  2018-03-22 09:52:12 +0800  
• 9b095404   no message Browse File »
  陶汉栋

  2018-03-22 09:51:22 +0800  

21 Mar, 2018

3 commits

• 3909048b   no message Browse File »
  姚旭斌

  2018-03-21 17:03:10 +0800  
• 2f0e5240   no message Browse File »
  陶汉栋

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

  2018-03-21 15:26:40 +0800  

20 Mar, 2018

7 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  
• c8a5db9f   no message Browse File »
  陶汉栋

  2018-03-20 14:40:19 +0800  
• d878a8a1   Merge branch 'developer' into yxb_dev ... Browse File »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java

  姚旭斌

  2018-03-20 14:12:44 +0800  
• 95b810ac   no message Browse File »
  陶汉栋

  2018-03-20 13:53:43 +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  
• 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

• 2c964317   no message Browse File »
  陶汉栋

  2018-03-19 18:31:11 +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

2 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  

16 Mar, 2018

6 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  
• b181dda4   no message Browse File »
  陶汉栋

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

  2018-03-16 13:42:44 +0800  
• bcb57ba9   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

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

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

15 Mar, 2018

1 commit

• 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  

13 Mar, 2018

1 commit

• 067374b8   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/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  

10 Mar, 2018

1 commit

• 42f6a92a   no message Browse File »
  姚旭斌

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

09 Mar, 2018

4 commits

• d8d08286   no message Browse File »
  姚旭斌

  2018-03-09 20:32:40 +0800  
• 37b52cab   no message Browse File »
  姚旭斌

  2018-03-09 17:46:12 +0800  
• 02540182   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-09 13:15:26 +0800  
• 50891b90   no message Browse File »
  姚旭斌

  2018-03-09 11:15:32 +0800  

08 Mar, 2018

4 commits

• 69a30786   no message Browse File »
  姚旭斌

  2018-03-08 16:37:54 +0800  
• 564dad4c   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-08 16:37:14 +0800  
• 11f0c65b   no message Browse File »
  姚旭斌

  2018-03-08 15:04:47 +0800  
• a87a6743   no message Browse File »
  姚旭斌

  2018-03-08 13:39:18 +0800