22 Apr, 2018

1 commit

• f96e1956   no message Browse Dir »
  陶汉栋

  2018-04-22 12:06:48 +0800  

19 Apr, 2018

5 commits

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

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

• 774a0595   no message Browse Dir »
  wwx

  2018-04-18 14:28:19 +0800  
• f3a94eee   no message Browse Dir »
  wwx

  2018-04-18 09:19:45 +0800  

16 Apr, 2018

1 commit

• c2e55796   no message Browse Dir »
  wwx

  2018-04-16 18:24:53 +0800  

14 Apr, 2018

1 commit

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

  2018-04-14 08:13:41 +0800  

13 Apr, 2018

1 commit

• e9804745   no message Browse Dir »
  姚旭斌

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

11 Apr, 2018

2 commits

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

  2018-04-11 09:15:38 +0800  
• 84aba162   no message Browse Dir »
  段合江

  2018-04-11 09:14:50 +0800  

10 Apr, 2018

2 commits

• 17585259   no message Browse Dir »
  姚旭斌

  2018-04-10 23:55:51 +0800  
• a0178454   no message Browse Dir »
  陶汉栋

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

08 Apr, 2018

1 commit

• 08b7799e   no message Browse Dir »
  姚旭斌

  2018-04-08 19:23:34 +0800  

04 Apr, 2018

3 commits

• 5800945b   no message Browse Dir »
  姚旭斌

  2018-04-04 10:46:36 +0800  
• 24a5ea4a   no message Browse Dir »
  姚旭斌

  2018-04-04 09:47:58 +0800  
• 6a4eb0f4   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »

  # Conflicts:
  #	app/libs/processor.jar

  张道锋

  2018-04-04 09:34:02 +0800  

30 Mar, 2018

3 commits

• 0b39881e   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/libs/processor.jar

  姚旭斌

  2018-03-30 14:57:04 +0800  
• cb057a09   no message Browse Dir »
  姚旭斌

  2018-03-30 14:56:23 +0800  
• ef29e61f   no message Browse Dir »
  张道锋

  2018-03-30 14:45:51 +0800  

29 Mar, 2018

1 commit

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

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

28 Mar, 2018

2 commits

• 0cbfbb68   no message Browse Dir »
  陶汉栋

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

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

27 Mar, 2018

3 commits

• 4f854ee0   no message Browse Dir »
  张道锋

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

  2018-03-27 16:50:11 +0800  
• 92beb983   no message Browse Dir »
  陶汉栋

  2018-03-27 10:59:29 +0800  

26 Mar, 2018

2 commits

• e18ab61a   no message Browse Dir »
  陶汉栋

  2018-03-26 17:52:42 +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

1 commit

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

  # Conflicts:
  #	.idea/modules.xml

  姚旭斌

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

23 Mar, 2018

4 commits

• 7c993489   no message Browse Dir »
  陶汉栋

  2018-03-23 17:45:24 +0800  
• 8176e156   no message Browse Dir »
  陶汉栋

  2018-03-23 16:47:02 +0800  
• d106d2db   Merge branch 'developer' into yxb_dev ... Browse Dir »

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

  姚旭斌

  2018-03-23 16:19:57 +0800  
• abf181bd   no message Browse Dir »
  张道锋

  2018-03-23 16:01:44 +0800  

22 Mar, 2018

4 commits

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

  # 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  
• f79e086c   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

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

  2018-03-22 11:06:39 +0800  
• e518b71b   no message Browse Dir »
  张道锋

  2018-03-22 10:53:19 +0800  

20 Mar, 2018

1 commit

• 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