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

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

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

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

26 Mar, 2018

1 commit

• 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

3 commits

• aa386a0f   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

  2018-03-24 10:54:41 +0800  
• 4b52df23   no message Browse File »
  陶汉栋

  2018-03-24 10:25:56 +0800  
• e456fe36   Merge branch 'developer' into yxb_dev ... Browse File »

  # Conflicts:
  #	.idea/modules.xml

  姚旭斌

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

23 Mar, 2018

4 commits

• 7c993489   no message Browse File »
  陶汉栋

  2018-03-23 17:45:24 +0800  
• 8176e156   no message Browse File »
  陶汉栋

  2018-03-23 16:47:02 +0800  
• 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  

16 Mar, 2018

1 commit

• bcb57ba9   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

  2018-03-16 09:07:41 +0800  

15 Mar, 2018

4 commits

• 08e1bf53   no message Browse File »
  陶汉栋

  2018-03-15 17:57:59 +0800  
• 07328347   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-15 17:32:04 +0800  
• df6597cd   no message Browse File »
  姚旭斌

  2018-03-15 17:02:38 +0800  
• 3163a156   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-15 08:20:51 +0800  

14 Mar, 2018

1 commit

• de62641e   no message Browse File »
  姚旭斌

  2018-03-14 17:02:44 +0800  

13 Mar, 2018

2 commits

• 87ab95b8   Merge branch 'developer' into yxb_dev ... Browse File »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java

  姚旭斌

  2018-03-13 11:19:58 +0800  
• 1ca679e0   no message Browse File »
  陶汉栋

  2018-03-13 08:08:35 +0800  

08 Mar, 2018

5 commits

• 5d31a3b8   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse File »
  姚旭斌

  2018-03-08 16:37:57 +0800  
• 34c57df7   no message Browse File »
  陶汉栋

  2018-03-08 16:37:07 +0800  
• 6d719af4   no message Browse File »
  陶汉栋

  2018-03-08 11:44:32 +0800  
• b48d20df   no message Browse File »
  陶汉栋

  2018-03-08 11:33:14 +0800  
• 7485281a   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-08 08:22:01 +0800  

07 Mar, 2018

1 commit

• 118e25c4   no message Browse File »
  姚旭斌

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

06 Mar, 2018

1 commit

• ce26434c   no message Browse File »
  陶汉栋

  2018-03-06 08:56:35 +0800  

05 Mar, 2018

2 commits

• 116a57e2   no message Browse File »
  陶汉栋

  2018-03-05 17:38:03 +0800  
• 54127ffd   no message Browse File »
  陶汉栋

  2018-03-05 17:33:43 +0800