27 Mar, 2018

1 commit

• 4f854ee0   no message Browse Dir »
  张道锋

  2018-03-27 16:54:18 +0800  

26 Mar, 2018

3 commits

• e18ab61a   no message Browse Dir »
  陶汉栋

  2018-03-26 17:52:42 +0800  
• 38b93710   no message Browse Dir »
  陶汉栋

  2018-03-26 13:07:21 +0800  
• 8c9c3f09   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  张道锋

  2018-03-26 10:08:18 +0800  

24 Mar, 2018

4 commits

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

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

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

  姚旭斌

  2018-03-24 17:32:14 +0800  
• 85477cb5   no message Browse Dir »
  陶汉栋

  2018-03-24 17:04:57 +0800  
• e456fe36   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	.idea/modules.xml

  姚旭斌

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

23 Mar, 2018

1 commit

• 8176e156   no message Browse Dir »
  陶汉栋

  2018-03-23 16:47:02 +0800  

22 Mar, 2018

1 commit

• 50ca3597   no message Browse Dir »
  张道锋

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

20 Mar, 2018

3 commits

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

  2018-03-20 14:40:19 +0800  

19 Mar, 2018

3 commits

• 3ad71d87   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  张道锋

  2018-03-19 18:04:41 +0800  
• bb448559   Merge branch 'developer' into yxb_dev ... Browse Dir »

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

  姚旭斌

  2018-03-19 17:33:22 +0800  
• 69c0bf10   no message Browse Dir »
  陶汉栋

  2018-03-19 14:39:01 +0800  

17 Mar, 2018

1 commit

• 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  

16 Mar, 2018

2 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  
• bfc68ef2   no message Browse Dir »
  陶汉栋

  2018-03-16 17:28:06 +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  
• 675bd555   no message Browse Dir »
  陶汉栋

  2018-03-15 17:24:56 +0800  
• c0b46499   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Dir »
  姚旭斌

  2018-03-15 17:02:42 +0800  
• 287f1d90   no message Browse Dir »
  陶汉栋

  2018-03-15 09:51:47 +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

2 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  
• 1ca679e0   no message Browse Dir »
  陶汉栋

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

12 Mar, 2018

1 commit

• 91d42621   no message Browse Dir »
  姚旭斌

  2018-03-12 20:53:51 +0800  

09 Mar, 2018

2 commits

• 9d177f29   no message Browse Dir »
  姚旭斌

  2018-03-09 17:23:54 +0800  
• 6f7b175c   no message Browse Dir »
  陶汉栋

  2018-03-09 17:12:34 +0800  

08 Mar, 2018

5 commits

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

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

  2018-03-08 16:37:14 +0800  
• 34c57df7   no message Browse Dir »
  陶汉栋

  2018-03-08 16:37:07 +0800  
• a87a6743   no message Browse Dir »
  姚旭斌

  2018-03-08 13:39:18 +0800  
• 7485281a   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-08 08:22:01 +0800  

07 Mar, 2018

1 commit

• 118e25c4   no message Browse Dir »
  姚旭斌

  2018-03-07 18:09:29 +0800  

05 Mar, 2018

1 commit

• 54127ffd   no message Browse Dir »
  陶汉栋

  2018-03-05 17:33:43 +0800