21 Mar, 2018

9 commits

• ccad9511   no message Browse Dir »
  姚旭斌

  7 years ago  
• d045d156   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  7 years ago  
• d7705ead   no message Browse Dir »
  姚旭斌

  7 years ago  
• 8c263840   no message Browse Dir »
  陶汉栋

  7 years ago  
• 7ffbaef3   no message Browse Dir »
  陶汉栋

  7 years ago  
• 561e50fc   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  7 years ago  
• 724a75c0   no message Browse Dir »
  陶汉栋

  7 years ago  
• 5f67acc0   Merge branch 'developer' into yxb_dev ... Browse Dir »

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

  姚旭斌

  7 years ago  
• 10a30b8e   no message Browse Dir »
  姚旭斌

  7 years ago  

20 Mar, 2018

19 commits

• e3be68e6   no message Browse Dir »
  陶汉栋

  7 years ago  
• 68baa86d   no message Browse Dir »
  陶汉栋

  7 years ago  
• b452c5b0   no message Browse Dir »
  陶汉栋

  7 years ago  
• 9ffe80e9   no message Browse Dir »
  陶汉栋

  7 years ago  
• 9ef200d2   no message Browse Dir »
  陶汉栋

  7 years ago  
• ae079afc   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java
  #	app/src/main/res/layout/activity_consult_two_level.xml
  #	app/src/main/res/layout/fragment_zi_xun.xml

  姚旭斌

  7 years ago  
• 81d7f8c8   no message Browse Dir »
  姚旭斌

  7 years ago  
• 0118d641   no message Browse Dir »
  陶汉栋

  7 years ago  
• 6a922153   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  7 years ago  
• c8a5db9f   no message Browse Dir »
  陶汉栋

  7 years ago  
• d878a8a1   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/model/consult/consultone/ConsultOneModel.java

  姚旭斌

  7 years ago  
• dc60ceee   no message Browse Dir »
  陶汉栋

  7 years ago  
• e80f1b4f   no message Browse Dir »
  姚旭斌

  7 years ago  
• 95b810ac   no message Browse Dir »
  陶汉栋

  7 years ago  
• 69e40270   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  7 years ago  
• 9e6ee8e8   no message Browse Dir »
  陶汉栋

  7 years ago  
• 6b5379b8   no message Browse Dir »
  陶汉栋

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

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

  陶汉栋

  7 years ago  
• 81109726   no message Browse Dir »
  陶汉栋

  7 years ago  

19 Mar, 2018

11 commits

• 6865d4ae   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  7 years ago  
• 2c964317   no message Browse Dir »
  陶汉栋

  7 years ago  
• 0e9edef2   no message Browse Dir »
  张道锋

  7 years ago  
• e71dbb40   no message Browse Dir »
  姚旭斌

  7 years ago  
• e09ea034   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # 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

  姚旭斌

  7 years ago  
• e2485424   no message Browse Dir »
  姚旭斌

  7 years ago  
• d64a8879   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  张道锋

  7 years ago  
• 2181568b   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »

  # Conflicts:
  #	app/src/main/AndroidManifest.xml
  #	app/src/main/java/com/shunzhi/parent/AppConfig.java
  #	app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
  #	app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java
  #	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
  #	app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java

  陶汉栋

  7 years ago  
• e7ab7c8e   no message Browse Dir »
  陶汉栋

  7 years ago  
• 864e9f4c   no message Browse Dir »
  姚旭斌

  7 years ago  
• ac3c7edc   no message Browse Dir »
  姚旭斌

  7 years ago  

18 Mar, 2018

1 commit

• 8c6d07ed   no message Browse Dir »
  姚旭斌

  7 years ago