20 Apr, 2018

18 commits

• bc58b7bb   Merge branch 'developer' into yxb_dev Browse Code »
  姚旭斌

  2018-04-20 23:03:54 +0800  
• 794b3d69   Merge branch 'wwx' into yxb_dev Browse Code »
  姚旭斌

  2018-04-20 23:03:34 +0800  
• 9310f3eb   no message Browse Code »
  姚旭斌

  2018-04-20 23:02:50 +0800  
• 6edf5ac2   no message Browse Code »
  陶汉栋

  2018-04-20 22:08:55 +0800  
• ce2026d3   no message Browse Code »
  姚旭斌

  2018-04-20 18:12:59 +0800  
• fcfeec87   no message Browse Code »
  wwx

  2018-04-20 16:58:19 +0800  
• 7afd77a0   no message Browse Code »
  陶汉栋

  2018-04-20 14:25:03 +0800  
• c1b6c512   Merge branch 'wwx' into yxb_dev ... Browse Code »

  # Conflicts:
  #	app/libs/processor.jar

  姚旭斌

  2018-04-20 13:44:57 +0800  
• 65f35ef4   Merge branch 'developer' into yxb_dev ... Browse Code »

  # Conflicts:
  #	app/libs/processor.jar

  姚旭斌

  2018-04-20 13:44:35 +0800  
• 6cc68c13   no message Browse Code »
  陶汉栋

  2018-04-20 13:40:39 +0800  
• 73e6410c   no message Browse Code »
  wwx

  2018-04-20 13:18:23 +0800  
• d246c3a5   Merge branch 'wwx' into yxb_dev Browse Code »
  姚旭斌

  2018-04-20 12:56:35 +0800  
• 1eaf1abb   no message Browse Code »
  姚旭斌

  2018-04-20 12:56:18 +0800  
• e28a131f   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into wwx ... Browse Code »

  # Conflicts:
  #	app/libs/processor.jar
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java

  wwx

  2018-04-20 12:22:10 +0800  
• a2590d7a   no message Browse Code »
  wwx

  2018-04-20 11:34:00 +0800  
• 45b64f1c   no message Browse Code »
  姚旭斌

  2018-04-20 11:27:41 +0800  
• bcc5360e   no message Browse Code »
  wwx

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

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

19 Apr, 2018

14 commits

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

  2018-04-19 19:17:43 +0800  
• 12229e0d   no message Browse Code »
  姚旭斌

  2018-04-19 19:17:27 +0800  
• b51bca00   no message Browse Code »
  wwx

  2018-04-19 17:57:13 +0800  
• 9603b632   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into wwx Browse Code »
  wwx

  2018-04-19 16:36:30 +0800  
• e78e2e1d   no message Browse Code »
  姚旭斌

  2018-04-19 16:36:04 +0800  
• 21f099a4   Merge branch 'yxb_dev' into wwx ... Browse Code »

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

  wwx

  2018-04-19 16:31:40 +0800  
• 6643e444   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into wwx ... Browse Code »

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

  # 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  
• 16962567   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into wwx ... Browse Code »

  # Conflicts:
  #	app/libs/processor.jar

  wwx

  2018-04-19 16:27:48 +0800  
• edbb9eeb   no message Browse Code »
  姚旭斌

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

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

  # Conflicts:
  #	app/libs/processor.jar

  姚旭斌

  2018-04-19 13:14:57 +0800  
• d958596a   no message Browse Code »
  姚旭斌

  2018-04-19 13:14:23 +0800  
• faf9f809   no message Browse Code »
  wwx

  2018-04-19 10:11:33 +0800  

18 Apr, 2018

4 commits

• 55f0d839   no message Browse Code »
  wwx

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

  2018-04-18 14:28:19 +0800  
• 0baa5d11   no message Browse Code »
  wwx

  2018-04-18 10:32:24 +0800  
• f3a94eee   no message Browse Code »
  wwx

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

17 Apr, 2018

1 commit

• 3528d02b   no message Browse Code »
  wwx

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

16 Apr, 2018

2 commits

• 5d685fa7   no message Browse Code »
  wwx

  2018-04-16 18:26:28 +0800  
• c2e55796   no message Browse Code »
  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 Code »
  陶汉栋

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