11 May, 2018

2 commits

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

  2018-05-11 18:09:03 +0800  
• 6bcfb14f   no message Browse Dir »
  陶汉栋

  2018-05-11 16:48:14 +0800  

05 May, 2018

1 commit

• d0f6c4e9   no message Browse Dir »
  陶汉栋

  2018-05-05 11:14:54 +0800  

28 Apr, 2018

1 commit

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

  2018-04-28 18:47:52 +0800  

25 Apr, 2018

1 commit

• 386e4785   no message Browse Dir »
  姚旭斌

  2018-04-25 10:21:57 +0800  

24 Apr, 2018

3 commits

• 03248c7f   no message Browse Dir »
  陶汉栋

  2018-04-24 14:29:36 +0800  
• 1ca28828   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-04-24 11:37:04 +0800  
• 6c90ae8c   no message Browse Dir »
  姚旭斌

  2018-04-24 11:36:31 +0800  

22 Apr, 2018

1 commit

• 1ec4334b   no message Browse Dir »
  陶汉栋

  2018-04-22 12:58:28 +0800  

20 Apr, 2018

1 commit

• 9310f3eb   no message Browse Dir »
  姚旭斌

  2018-04-20 23:02:50 +0800  

19 Apr, 2018

5 commits

• 426dfc9c   Merge branch 'wwx' into yxb_dev Browse Dir »
  姚旭斌

  2018-04-19 19:17:43 +0800  
• d45ad6c3   Merge branch 'wwx' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/libs/processor.jar
  #	app/src/main/java/com/shunzhi/parent/AppConfig.java
  #	app/src/main/java/com/shunzhi/parent/api/ApplyReplaceCardApi.java
  #	app/src/main/java/com/shunzhi/parent/model/apply/ApplyReplaceCardModel.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java

  姚旭斌

  2018-04-19 16:28:51 +0800  
• edbb9eeb   no message Browse Dir »
  姚旭斌

  2018-04-19 16:26:41 +0800  
• 8e9c580c   no message Browse Dir »
  wwx

  2018-04-19 16:25:43 +0800  
• 772a6e0a   Merge branch 'wwx' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/libs/processor.jar

  姚旭斌

  2018-04-19 13:14:57 +0800  

18 Apr, 2018

2 commits

• 55f0d839   no message Browse Dir »
  wwx

  2018-04-18 18:07:38 +0800  
• 774a0595   no message Browse Dir »
  wwx

  2018-04-18 14:28:19 +0800  

17 Apr, 2018

1 commit

• 3528d02b   no message Browse Dir »
  wwx

  2018-04-17 18:07:43 +0800  

11 Apr, 2018

1 commit

• 41f159b5   Merge branch 'developer' into wwx Browse Dir »
  段合江

  2018-04-11 09:15:38 +0800  

10 Apr, 2018

1 commit

• a0178454   no message Browse Dir »
  陶汉栋

  2018-04-10 11:02:25 +0800  

08 Apr, 2018

3 commits

• 9595d58e   no message Browse Dir »
  姚旭斌

  2018-04-08 21:58:54 +0800  
• 08b7799e   no message Browse Dir »
  姚旭斌

  2018-04-08 19:23:34 +0800  
• 07503a80   no message Browse Dir »
  姚旭斌

  2018-04-08 10:35:11 +0800  

04 Apr, 2018

3 commits

• df3a9c11   no message Browse Dir »
  姚旭斌

  2018-04-04 21:43:07 +0800  
• afec02d6   no message Browse Dir »
  姚旭斌

  2018-04-04 15:19:23 +0800  
• 24a5ea4a   no message Browse Dir »
  姚旭斌

  2018-04-04 09:47:58 +0800  

26 Mar, 2018

4 commits

• 38b93710   no message Browse Dir »
  陶汉栋

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

  2018-03-26 10:23:41 +0800  
• ab99c955   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-26 10:21:23 +0800  
• 6648d446   no message Browse Dir »
  姚旭斌

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

23 Mar, 2018

1 commit

• 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  

22 Mar, 2018

3 commits

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

  2018-03-22 15:53:45 +0800  
• 432b4257   no message Browse Dir »
  陶汉栋

  2018-03-22 15:36:10 +0800  
• 50ca3597   no message Browse Dir »
  张道锋

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

20 Mar, 2018

4 commits

• d878a8a1   Merge branch 'developer' into yxb_dev ... Browse Dir »

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

  姚旭斌

  2018-03-20 14:12:44 +0800  
• e80f1b4f   no message Browse Dir »
  姚旭斌

  2018-03-20 13:59:31 +0800  
• 95b810ac   no message Browse Dir »
  陶汉栋

  2018-03-20 13:53:43 +0800  
• b8df71fe   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »

  # 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

2 commits

• e71dbb40   no message Browse Dir »
  姚旭斌

  2018-03-19 17:29:45 +0800  
• e09ea034   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # 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