19 Apr, 2018

2 commits

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

  # 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 File »
  姚旭斌

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

27 Mar, 2018

2 commits

• 4f854ee0   no message Browse File »
  张道锋

  2018-03-27 16:54:18 +0800  
• d96a7aeb   no message Browse File »
  张道锋

  2018-03-27 16:50:11 +0800  

26 Mar, 2018

8 commits

• 1dec60d7   no message Browse File »
  陶汉栋

  2018-03-26 15:34:05 +0800  
• b641fe18   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-26 15:30:56 +0800  
• 1ff2fc66   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

  2018-03-26 15:27:18 +0800  
• b932b573   no message Browse File »
  姚旭斌

  2018-03-26 15:27:07 +0800  
• 38a05c04   no message Browse File »
  张道锋

  2018-03-26 15:25:50 +0800  
• 7138f165   no message Browse File »
  陶汉栋

  2018-03-26 13:08:17 +0800  
• 38b93710   no message Browse File »
  陶汉栋

  2018-03-26 13:07:21 +0800  
• 78184bb7   no message Browse File »
  张道锋

  2018-03-26 10:23:30 +0800  

22 Mar, 2018

4 commits

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

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
  #	app/src/main/res/layout/fragment_mine.xml

  姚旭斌

  2018-03-22 12:30:21 +0800  
• f79e086c   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-22 11:39:34 +0800  
• 50ca3597   no message Browse File »
  张道锋

  2018-03-22 11:06:39 +0800  
• e518b71b   no message Browse File »
  张道锋

  2018-03-22 10:53:19 +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  

19 Mar, 2018

3 commits

• 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  
• d177b23c   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

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

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

17 Mar, 2018

1 commit

• c84d485d   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »

  # Conflicts:
  #	app/src/main/AndroidManifest.xml

  张道锋

  2018-03-17 17:34:49 +0800  

16 Mar, 2018

2 commits

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

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java

  姚旭斌

  2018-03-16 17:47:29 +0800  
• bfc68ef2   no message Browse File »
  陶汉栋

  2018-03-16 17:28:06 +0800  

15 Mar, 2018

1 commit

• 3163a156   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

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

14 Mar, 2018

3 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  
• de62641e   no message Browse File »
  姚旭斌

  2018-03-14 17:02:44 +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  

08 Mar, 2018

3 commits

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

  2018-03-08 16:37:57 +0800  
• 34c57df7   no message Browse File »
  陶汉栋

  2018-03-08 16:37:07 +0800  
• 7485281a   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-08 08:22:01 +0800  

07 Mar, 2018

1 commit

• 118e25c4   no message Browse File »
  姚旭斌

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