20 Apr, 2018

2 commits

• bcc5360e   no message Browse File »
  wwx

  2018-04-20 11:20:51 +0800  
• 105e0366   no message Browse File »
  姚旭斌

  2018-04-20 00:49:48 +0800  

19 Apr, 2018

4 commits

• 6643e444   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into wwx ... Browse File »

  # Conflicts:
  #	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

  wwx

  2018-04-19 16:30:24 +0800  
• d45ad6c3   Merge branch 'wwx' into yxb_dev ... Browse File »

  # 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 File »
  姚旭斌

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

  2018-04-19 16:25:43 +0800  

18 Apr, 2018

1 commit

• 55f0d839   no message Browse File »
  wwx

  2018-04-18 18:07:38 +0800  

11 Apr, 2018

1 commit

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

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

10 Apr, 2018

2 commits

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

  2018-04-10 19:38:31 +0800  
• 0cbb0554   no message Browse File »
  陶汉栋

  2018-04-10 17:24:33 +0800  

29 Mar, 2018

1 commit

• 762b1b1d   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  张道锋

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

28 Mar, 2018

2 commits

• 0cbfbb68   no message Browse File »
  陶汉栋

  2018-03-28 19:37:03 +0800  
• 62be613c   no message Browse File »
  姚旭斌

  2018-03-28 19:35:03 +0800  

27 Mar, 2018

2 commits

• 4f854ee0   no message Browse File »
  张道锋

  2018-03-27 16:54:18 +0800  
• d96a7aeb   no message Browse File »
  张道锋

  2018-03-27 16:50:11 +0800  

26 Mar, 2018

2 commits

• e18ab61a   no message Browse File »
  陶汉栋

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

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

24 Mar, 2018

7 commits

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

  2018-03-24 17:43:58 +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  
• 8afee2bd   no message Browse File »
  姚旭斌

  2018-03-24 17:31:29 +0800  
• ca2029b2   no message Browse File »
  陶汉栋

  2018-03-24 17:18:37 +0800  
• b4a2cc26   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  姚旭斌

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

  2018-03-24 12:33:28 +0800  
• e456fe36   Merge branch 'developer' into yxb_dev ... Browse File »

  # Conflicts:
  #	.idea/modules.xml

  姚旭斌

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

23 Mar, 2018

8 commits

• 257465ea   no message Browse File »
  陶汉栋

  2018-03-23 17:46:50 +0800  
• 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  
• c5aac4c3   no message Browse File »
  陶汉栋

  2018-03-23 16:06:22 +0800  
• 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  
• abf181bd   no message Browse File »
  张道锋

  2018-03-23 16:01:44 +0800  
• 4065e67b   no message Browse File »
  姚旭斌

  2018-03-23 15:37:40 +0800  
• 69679356   no message Browse File »
  陶汉栋

  2018-03-23 09:27:08 +0800  

22 Mar, 2018

4 commits

• 935f129c   no message Browse File »
  姚旭斌

  2018-03-22 18:17:25 +0800  
• de5c40dd   Merge branch 'developer' into yxb_dev ... Browse File »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
  #	app/src/main/res/layout/fragment_mine.xml

  姚旭斌

  2018-03-22 12:30:21 +0800  
• 49d6fe65   no message Browse File »
  陶汉栋

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

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

21 Mar, 2018

1 commit

• ccad9511   no message Browse File »
  姚旭斌

  2018-03-21 16:41:33 +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  
• 69e40270   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

  2018-03-20 11:32:10 +0800