15 Mar, 2018

6 commits

• df6597cd   no message Browse Code »
  姚旭斌

  2018-03-15 17:02:38 +0800  
• 02c439f8   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Code »
  姚旭斌

  2018-03-15 09:50:52 +0800  
• b3c43071   no message Browse Code »
  姚旭斌

  2018-03-15 09:50:47 +0800  
• f552dcac   no message Browse Code »
  陶汉栋

  2018-03-15 08:39:56 +0800  
• 3163a156   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  陶汉栋

  2018-03-15 08:20:51 +0800  
• b8d5d471   no message Browse Code »
  陶汉栋

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

14 Mar, 2018

4 commits

• 8c991655   no message Browse Code »
  姚旭斌

  2018-03-14 20:56:02 +0800  
• 26d3505e   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev ... Browse Code »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java

  姚旭斌

  2018-03-14 17:04:29 +0800  
• de62641e   no message Browse Code »
  姚旭斌

  2018-03-14 17:02:44 +0800  
• 75be5d9a   no message Browse Code »
  陶汉栋

  2018-03-14 16:49:37 +0800  

13 Mar, 2018

9 commits

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

  2018-03-13 13:42:06 +0800  
• b0b98d12   no message Browse Code »
  陶汉栋

  2018-03-13 13:41:54 +0800  
• 87ab95b8   Merge branch 'developer' into yxb_dev ... Browse Code »

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

  姚旭斌

  2018-03-13 11:19:58 +0800  
• ffe64e2f   no message Browse Code »
  姚旭斌

  2018-03-13 11:11:32 +0800  
• 856b277c   no message Browse Code »
  姚旭斌

  2018-03-13 11:11:27 +0800  
• a56f821a   no message Browse Code »
  陶汉栋

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

  2018-03-13 09:12:25 +0800  
• 067374b8   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Code »

  # 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  
• 1ca679e0   no message Browse Code »
  陶汉栋

  2018-03-13 08:08:35 +0800  

12 Mar, 2018

3 commits

• 91d42621   no message Browse Code »
  姚旭斌

  2018-03-12 20:53:51 +0800  
• 4512e826   no message Browse Code »
  姚旭斌

  2018-03-12 16:48:20 +0800  
• bcafe53a   no message Browse Code »
  姚旭斌

  2018-03-12 11:06:16 +0800  

10 Mar, 2018

1 commit

• 42f6a92a   no message Browse Code »
  姚旭斌

  2018-03-10 14:40:47 +0800  

09 Mar, 2018

15 commits

• d8d08286   no message Browse Code »
  姚旭斌

  2018-03-09 20:32:40 +0800  
• 37b52cab   no message Browse Code »
  姚旭斌

  2018-03-09 17:46:12 +0800  
• 9d177f29   no message Browse Code »
  姚旭斌

  2018-03-09 17:23:54 +0800  
• 6f7b175c   no message Browse Code »
  陶汉栋

  2018-03-09 17:12:34 +0800  
• 8e86a2dc   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  陶汉栋

  2018-03-09 17:09:06 +0800  
• cc09aa55   no message Browse Code »
  陶汉栋

  2018-03-09 17:08:43 +0800  
• abc79afd   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Code »
  姚旭斌

  2018-03-09 16:50:50 +0800  
• 751075af   no message Browse Code »
  姚旭斌

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

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

  2018-03-09 16:47:16 +0800  
• 59f55e6b   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev ... Browse Code »

  # Conflicts:
  #	app/src/main/res/values/colors.xml

  姚旭斌

  2018-03-09 15:33:28 +0800  
• 1ff66eb6   no message Browse Code »
  姚旭斌

  2018-03-09 15:31:10 +0800  
• 02540182   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  陶汉栋

  2018-03-09 13:15:26 +0800  
• 5ade1fb7   no message Browse Code »
  陶汉栋

  2018-03-09 13:15:15 +0800  
• 50891b90   no message Browse Code »
  姚旭斌

  2018-03-09 11:15:32 +0800  

08 Mar, 2018

2 commits

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

  2018-03-08 16:37:57 +0800  
• 69a30786   no message Browse Code »
  姚旭斌

  2018-03-08 16:37:54 +0800