12 May, 2018

1 commit

• 666971bf   no message Browse Dir »
  姚旭斌

  2018-05-12 15:28:45 +0800  

11 May, 2018

3 commits

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

  2018-05-11 16:48:24 +0800  
• c1a67969   no message Browse Dir »
  姚旭斌

  2018-05-11 16:27:42 +0800  
• 3fe36dd9   no message Browse Dir »
  姚旭斌

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

05 May, 2018

1 commit

• b7d02685   no message Browse Dir »
  陶汉栋

  2018-05-05 09:43:21 +0800  

20 Apr, 2018

3 commits

• 6edf5ac2   no message Browse Dir »
  陶汉栋

  2018-04-20 22:08:55 +0800  
• d246c3a5   Merge branch 'wwx' into yxb_dev Browse Dir »
  姚旭斌

  2018-04-20 12:56:35 +0800  
• bcc5360e   no message Browse Dir »
  wwx

  2018-04-20 11:20:51 +0800  

19 Apr, 2018

3 commits

• 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  

18 Apr, 2018

2 commits

• 55f0d839   no message Browse Dir »
  wwx

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

  2018-04-18 09:19:45 +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

3 commits

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

  2018-04-10 19:38:31 +0800  
• a0178454   no message Browse Dir »
  陶汉栋

  2018-04-10 11:02:25 +0800  
• 7cd6b667   no message Browse Dir »
  陶汉栋

  2018-04-10 11:00:16 +0800  

08 Apr, 2018

2 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  

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

1 commit

• cb057a09   no message Browse Dir »
  姚旭斌

  2018-03-30 14:56:23 +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  

26 Mar, 2018

1 commit

• 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

10 commits

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

  2018-03-24 17:43:58 +0800  
• f6c9454a   no message Browse Dir »
  姚旭斌

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

  2018-03-24 17:31:29 +0800  
• 7b8a96d8   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

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

  2018-03-24 16:19:30 +0800  
• 88c7d7d2   no message Browse Dir »
  陶汉栋

  2018-03-24 11:15:17 +0800  
• 3305740f   no message Browse Dir »
  陶汉栋

  2018-03-24 10:26:30 +0800  
• e456fe36   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	.idea/modules.xml

  姚旭斌

  2018-03-24 09:43:47 +0800  
• 8d78127a   no message Browse Dir »
  姚旭斌

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