05 May, 2018

2 commits

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

  2018-05-05 14:03:23 +0800  
• 9097b24e   no message Browse File »
  姚旭斌

  2018-05-05 13:44:17 +0800  

28 Apr, 2018

1 commit

• a41e62a6   no message Browse File »
  陶汉栋

  2018-04-28 18:47:44 +0800  

14 Apr, 2018

1 commit

• ea6ec964   no message Browse File »
  陶汉栋

  2018-04-14 08:08:10 +0800  

12 Apr, 2018

1 commit

• 4d51724e   no message Browse File »
  姚旭斌

  2018-04-12 11:33:51 +0800  

11 Apr, 2018

1 commit

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

  2018-04-11 09:15:38 +0800  

10 Apr, 2018

2 commits

• 17585259   no message Browse File »
  姚旭斌

  2018-04-10 23:55:51 +0800  
• 7cd6b667   no message Browse File »
  陶汉栋

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

08 Apr, 2018

1 commit

• 07503a80   no message Browse File »
  姚旭斌

  2018-04-08 10:35:11 +0800  

04 Apr, 2018

7 commits

• a299f710   Merge branch 'developer' into yxb_dev ... Browse File »

  # Conflicts:
  #	.idea/modules.xml
  #	app/libs/processor.jar

  姚旭斌

  2018-04-04 21:43:39 +0800  
• c45f5ac9   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-04-04 18:48:23 +0800  
• 9bb016c5   no message Browse File »
  陶汉栋

  2018-04-04 18:48:15 +0800  
• afec02d6   no message Browse File »
  姚旭斌

  2018-04-04 15:19:23 +0800  
• a52d9fd6   no message Browse File »
  张道锋

  2018-04-04 10:39:55 +0800  
• 9ee7c30c   Merge branch 'developer' into yxb_dev ... Browse File »

  # Conflicts:
  #	app/libs/processor.jar

  姚旭斌

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

  # Conflicts:
  #	app/libs/processor.jar

  张道锋

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

02 Apr, 2018

1 commit

• 61f40825   no message Browse File »
  陶汉栋

  2018-04-02 14:32:25 +0800  

30 Mar, 2018

2 commits

• cb057a09   no message Browse File »
  姚旭斌

  2018-03-30 14:56:23 +0800  
• 42f883a1   no message Browse File »
  张道锋

  2018-03-30 10:40:49 +0800  

29 Mar, 2018

2 commits

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

  2018-03-29 18:09:40 +0800  
• 1612af77   no message Browse File »
  张道锋

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

28 Mar, 2018

2 commits

• 47a38b09   no message Browse File »
  陶汉栋

  2018-03-28 19:36:02 +0800  
• 62be613c   no message Browse File »
  姚旭斌

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

27 Mar, 2018

2 commits

• e60e729f   no message Browse File »
  张道锋

  2018-03-27 16:54:23 +0800  
• 4f854ee0   no message Browse File »
  张道锋

  2018-03-27 16:54:18 +0800  

26 Mar, 2018

7 commits

• 853d6390   no message Browse File »
  陶汉栋

  2018-03-26 15:33:00 +0800  
• 99e7abd3   no message Browse File »
  姚旭斌

  2018-03-26 15:32:56 +0800  
• b641fe18   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-26 15:30:56 +0800  
• 1ff2fc66   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

  2018-03-26 15:27:18 +0800  
• 38a05c04   no message Browse File »
  张道锋

  2018-03-26 15:25:50 +0800  
• 78184bb7   no message Browse File »
  张道锋

  2018-03-26 10:23:30 +0800  
• 8c9c3f09   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  张道锋

  2018-03-26 10:08:18 +0800  

24 Mar, 2018

2 commits

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

  # Conflicts:
  #	.idea/modules.xml

  姚旭斌

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

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

23 Mar, 2018

2 commits

• d106d2db   Merge branch 'developer' into yxb_dev ... Browse File »

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

  姚旭斌

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

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

22 Mar, 2018

1 commit

• 50ca3597   no message Browse File »
  张道锋

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

19 Mar, 2018

3 commits

• 2c964317   no message Browse File »
  陶汉栋

  2018-03-19 18:31:11 +0800  
• d8f68cd8   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-19 14:39:06 +0800  
• e09ea034   Merge branch 'developer' into yxb_dev ... Browse File »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
  #	app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
  #	app/src/main/res/layout/activity_web_view.xml

  姚旭斌

  2018-03-19 14:22:43 +0800