19 Apr, 2018

4 commits

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

  # Conflicts:
  #	app/libs/processor.jar

  wwx

  2018-04-19 16:27:48 +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  
• d958596a   no message Browse Dir »
  姚旭斌

  2018-04-19 13:14:23 +0800  

17 Apr, 2018

1 commit

• 3528d02b   no message Browse Dir »
  wwx

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

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

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

  2018-04-10 11:00:16 +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

2 commits

• 4f854ee0   no message Browse Dir »
  张道锋

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

  2018-03-27 10:59:29 +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

9 commits

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

  2018-03-24 16:18:55 +0800  
• aa386a0f   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-24 10:54:41 +0800  
• 70b2f9e0   no message Browse Dir »
  陶汉栋

  2018-03-24 10:52:43 +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  
• 0abe9fd6   no message Browse Dir »
  陶汉栋

  2018-03-24 09:15:15 +0800  

23 Mar, 2018

6 commits

• 7c993489   no message Browse Dir »
  陶汉栋

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

  2018-03-23 16:06:22 +0800  
• ec9c6c5d   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »

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

  张道锋

  2018-03-23 16:03:39 +0800  
• e56d2f35   no message Browse Dir »
  姚旭斌

  2018-03-23 15:55:12 +0800  
• 4065e67b   no message Browse Dir »
  姚旭斌

  2018-03-23 15:37:40 +0800  
• 0d009088   no message Browse Dir »
  姚旭斌

  2018-03-23 15:37:33 +0800  

22 Mar, 2018

3 commits

• ae9a2c2f   no message Browse Dir »
  陶汉栋

  2018-03-22 16:51:54 +0800  
• 2a83582a   no message Browse Dir »
  姚旭斌

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

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

21 Mar, 2018

2 commits

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

  2018-03-21 15:26:55 +0800  
• 8c263840   no message Browse Dir »
  陶汉栋

  2018-03-21 14:42:38 +0800  

19 Mar, 2018

2 commits

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

  2018-03-19 13:26:00 +0800  
• 2181568b   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »

  # Conflicts:
  #	app/src/main/AndroidManifest.xml
  #	app/src/main/java/com/shunzhi/parent/AppConfig.java
  #	app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
  #	app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java
  #	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
  #	app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java

  陶汉栋

  2018-03-19 11:34:34 +0800  

17 Mar, 2018

2 commits

• c84d485d   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »

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

  张道锋

  2018-03-17 17:34:49 +0800  
• 26d17696   no message Browse Dir »
  姚旭斌

  2018-03-17 17:27:50 +0800  

16 Mar, 2018

1 commit

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

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java

  姚旭斌

  2018-03-16 17:47:29 +0800