24 Apr, 2018

3 commits

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

  2018-04-24 08:18:29 +0800  

22 Apr, 2018

2 commits

• 1ec4334b   no message Browse Dir »
  陶汉栋

  2018-04-22 12:58:28 +0800  
• f96e1956   no message Browse Dir »
  陶汉栋

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

20 Apr, 2018

3 commits

• 794b3d69   Merge branch 'wwx' into yxb_dev Browse Dir »
  姚旭斌

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

  2018-04-20 23:02:50 +0800  
• fcfeec87   no message Browse Dir »
  wwx

  2018-04-20 16:58:19 +0800  

19 Apr, 2018

5 commits

• 12229e0d   no message Browse Dir »
  姚旭斌

  2018-04-19 19:17:27 +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  
• 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  
• faf9f809   no message Browse Dir »
  wwx

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

18 Apr, 2018

4 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  
• 0baa5d11   no message Browse Dir »
  wwx

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

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

17 Apr, 2018

1 commit

• 3528d02b   no message Browse Dir »
  wwx

  2018-04-17 18:07:43 +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

1 commit

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

  2018-04-11 09:15:38 +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

4 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  
• 49837d23   no message Browse Dir »
  姚旭斌

  2018-04-08 11:09:15 +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

2 commits

• 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

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

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

  2018-03-24 17:04:57 +0800  
• 38c88362   no message Browse Dir »
  姚旭斌

  2018-03-24 17:01:41 +0800  
• e92104a6   no message Browse Dir »
  姚旭斌

  2018-03-24 16:19:30 +0800  
• b4a2cc26   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  姚旭斌

  2018-03-24 14:54:44 +0800  
• d4f3a486   no message Browse Dir »
  姚旭斌

  2018-03-24 14:54:32 +0800