20 Apr, 2018

1 commit

• 45b64f1c   no message Browse Dir »
  姚旭斌

  2018-04-20 11:27:41 +0800  

19 Apr, 2018

2 commits

• 6643e444   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into wwx ... Browse Dir »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/AppConfig.java
  #	app/src/main/java/com/shunzhi/parent/api/ApplyReplaceCardApi.java
  #	app/src/main/java/com/shunzhi/parent/model/apply/ApplyReplaceCardModel.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java

  wwx

  2018-04-19 16:30:24 +0800  
• edbb9eeb   no message Browse Dir »
  姚旭斌

  2018-04-19 16:26:41 +0800  

11 Apr, 2018

1 commit

• 41f159b5   Merge branch 'developer' into wwx Browse Dir »
  段合江

  2018-04-11 09:15:38 +0800  

10 Apr, 2018

2 commits

• fd11b76f   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-04-10 19:38:31 +0800  
• 0cbb0554   no message Browse Dir »
  陶汉栋

  2018-04-10 17:24:33 +0800  

27 Mar, 2018

2 commits

• 4f854ee0   no message Browse Dir »
  张道锋

  2018-03-27 16:54:18 +0800  
• 92beb983   no message Browse Dir »
  陶汉栋

  2018-03-27 10:59:29 +0800  

26 Mar, 2018

1 commit

• 8c9c3f09   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  张道锋

  2018-03-26 10:08:18 +0800  

24 Mar, 2018

2 commits

• aa386a0f   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-24 10:54:41 +0800  
• 70b2f9e0   no message Browse Dir »
  陶汉栋

  2018-03-24 10:52:43 +0800  

22 Mar, 2018

1 commit

• 50ca3597   no message Browse Dir »
  张道锋

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

21 Mar, 2018

2 commits

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

  2018-03-21 15:26:55 +0800  
• 8c263840   no message Browse Dir »
  陶汉栋

  2018-03-21 14:42:38 +0800  

19 Mar, 2018

3 commits

• 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

  姚旭斌

  2018-03-19 14:22:43 +0800  
• d177b23c   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-19 11:24:17 +0800  
• beafeb7e   no message Browse Dir »
  张道锋

  2018-03-19 11:13:40 +0800  

15 Mar, 2018

2 commits

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

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

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

13 Mar, 2018

1 commit

• 067374b8   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/ui/fragment/ReportFragment.java
  #	app/src/main/res/layout/fragment_report.xml
  #	mvpsdk/src/main/java/com/share/mvpsdk/base/activity/BaseCompatActivity.java
  #	mvpsdk/src/main/java/com/share/mvpsdk/utils/OkHttpExceptionUtil.java

  陶汉栋

  2018-03-13 08:18:50 +0800  

12 Mar, 2018

1 commit

• 4512e826   no message Browse Dir »
  姚旭斌

  2018-03-12 16:48:20 +0800