17 Mar, 2018

1 commit

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

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

  姚旭斌

  2018-03-17 10:34:37 +0800  

16 Mar, 2018

1 commit

• 0a469ad2   no message Browse File »
  陶汉栋

  2018-03-16 19:12:57 +0800  

14 Mar, 2018

1 commit

• 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  

13 Mar, 2018

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

  2018-03-13 09:35:51 +0800  
• 5ecc3e8e   no message Browse File »
  陶汉栋

  2018-03-13 09:12:25 +0800