26 Mar, 2018

4 commits

• 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

6 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  
• 190b12d2   no message Browse File »
  张道锋

  2018-03-19 13:25:56 +0800  
• e7ab7c8e   no message Browse File »
  陶汉栋

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

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

17 Mar, 2018

1 commit

• c84d837b   no message Browse File »
  张道锋

  2018-03-17 17:33:53 +0800  

08 Mar, 2018

1 commit

• 860a2088   no message Browse File »
  陶汉栋

  2018-03-08 08:21:39 +0800  

07 Mar, 2018

1 commit

• 118e25c4   no message Browse File »
  姚旭斌

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

05 Mar, 2018

1 commit

• 54127ffd   no message Browse File »
  陶汉栋

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