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  

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  

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

4 commits

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

  2018-03-15 17:35:29 +0800  
• 675bd555   no message Browse File »
  陶汉栋

  2018-03-15 17:24:56 +0800  
• c0b46499   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse File »
  姚旭斌

  2018-03-15 17:02:42 +0800  
• ecc56fa8   no message Browse File »
  陶汉栋

  2018-03-15 11:50:32 +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  

09 Mar, 2018

4 commits

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

  2018-03-09 16:50:50 +0800  
• 217deceb   no message Browse File »
  陶汉栋

  2018-03-09 16:47:59 +0800  
• 96a294c3   no message Browse File »
  陶汉栋

  2018-03-09 16:47:16 +0800  
• 1ff66eb6   no message Browse File »
  姚旭斌

  2018-03-09 15:31:10 +0800  

05 Mar, 2018

1 commit

• 54127ffd   no message Browse File »
  陶汉栋

  2018-03-05 17:33:43 +0800