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  
• 70b2f9e0   no message Browse File »
  陶汉栋

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

  # Conflicts:
  #	.idea/modules.xml

  姚旭斌

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

23 Mar, 2018

1 commit

• 7c993489   no message Browse File »
  陶汉栋

  2018-03-23 17:45:24 +0800  

22 Mar, 2018

1 commit

• 50ca3597   no message Browse File »
  张道锋

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

20 Mar, 2018

2 commits

• 9ffe80e9   no message Browse File »
  陶汉栋

  2018-03-20 17:33:35 +0800  
• 81d7f8c8   no message Browse File »
  姚旭斌

  2018-03-20 17:12:23 +0800  

15 Mar, 2018

2 commits

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

  2018-03-15 09:50:52 +0800  
• b8d5d471   no message Browse File »
  陶汉栋

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

14 Mar, 2018

2 commits

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

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java

  姚旭斌

  2018-03-14 17:04:29 +0800  
• 75be5d9a   no message Browse File »
  陶汉栋

  2018-03-14 16:49:37 +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