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

2 commits

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

  # Conflicts:
  #	.idea/modules.xml

  姚旭斌

  2018-03-24 09:43:47 +0800  
• 0abe9fd6   no message Browse File »
  陶汉栋

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

23 Mar, 2018

4 commits

• 257465ea   no message Browse File »
  陶汉栋

  2018-03-23 17:46:50 +0800  
• bec10697   no message Browse File »
  姚旭斌

  2018-03-23 16:15:54 +0800  
• c5aac4c3   no message Browse File »
  陶汉栋

  2018-03-23 16:06:22 +0800  
• e56d2f35   no message Browse File »
  姚旭斌

  2018-03-23 15:55:12 +0800  

22 Mar, 2018

1 commit

• 50ca3597   no message Browse File »
  张道锋

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

21 Mar, 2018

2 commits

• 2f0e5240   no message Browse File »
  陶汉栋

  2018-03-21 15:45:26 +0800  
• d7705ead   no message Browse File »
  姚旭斌

  2018-03-21 15:26:40 +0800  

20 Mar, 2018

1 commit

• b8df71fe   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »

  # Conflicts:
  #	.idea/modules.xml
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java

  陶汉栋

  2018-03-20 08:29:22 +0800  

19 Mar, 2018

4 commits

• e71dbb40   no message Browse File »
  姚旭斌

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

  2018-03-19 14:39:06 +0800  
• e2485424   no message Browse File »
  姚旭斌

  2018-03-19 14:14:35 +0800  
• 2e560dbc   no message Browse File »
  张道锋

  2018-03-19 13:55:57 +0800  

17 Mar, 2018

1 commit

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

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

  张道锋

  2018-03-17 17:34:49 +0800  

16 Mar, 2018

7 commits

• dec4c9a0   no message Browse File »
  姚旭斌

  2018-03-16 23:04:48 +0800  
• 658234ab   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

  2018-03-16 17:57:11 +0800  
• 8510cba8   no message Browse File »
  陶汉栋

  2018-03-16 17:55:36 +0800  
• 8f6486da   Merge branch 'developer' into yxb_dev ... Browse File »

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

  姚旭斌

  2018-03-16 17:49:37 +0800  
• b9b5e32e   Merge branch 'developer' into yxb_dev ... Browse File »

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

  姚旭斌

  2018-03-16 17:47:29 +0800  
• f7a6aa86   no message Browse File »
  陶汉栋

  2018-03-16 17:34:00 +0800  
• bfc68ef2   no message Browse File »
  陶汉栋

  2018-03-16 17:28:06 +0800