16 Mar, 2018

14 commits

• 8f6486da   Merge branch 'developer' into yxb_dev ... Browse Code »

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

  姚旭斌

  2018-03-16 17:49:37 +0800  
• b9b5e32e   Merge branch 'developer' into yxb_dev ... Browse Code »

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

  姚旭斌

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

  2018-03-16 17:34:00 +0800  
• bfc68ef2   no message Browse Code »
  陶汉栋

  2018-03-16 17:28:06 +0800  
• ad89d180   Merge branch 'developer' into yxb_dev ... Browse Code »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/AppConfig.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java

  姚旭斌

  2018-03-16 17:17:57 +0800  
• 2c3dd885   no message Browse Code »
  姚旭斌

  2018-03-16 17:16:05 +0800  
• b181dda4   no message Browse Code »
  陶汉栋

  2018-03-16 13:45:20 +0800  
• a97b79d9   no message Browse Code »
  姚旭斌

  2018-03-16 13:42:44 +0800  
• 7143f4b6   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  陶汉栋

  2018-03-16 13:29:33 +0800  
• 378663ec   no message Browse Code »
  陶汉栋

  2018-03-16 13:29:22 +0800  
• bcb57ba9   Merge branch 'developer' into yxb_dev Browse Code »
  姚旭斌

  2018-03-16 09:07:41 +0800  
• b21e283f   no message Browse Code »
  姚旭斌

  2018-03-16 09:07:19 +0800  
• 6a57d64f   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  陶汉栋

  2018-03-16 08:24:15 +0800  
• b808b918   no message Browse Code »
  陶汉栋

  2018-03-16 08:24:03 +0800  

15 Mar, 2018

17 commits

• 08e1bf53   no message Browse Code »
  陶汉栋

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

  2018-03-15 17:35:29 +0800  
• 616118e8   no message Browse Code »
  姚旭斌

  2018-03-15 17:35:23 +0800  
• 07328347   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  陶汉栋

  2018-03-15 17:32:04 +0800  
• d4dc8b01   no message Browse Code »
  陶汉栋

  2018-03-15 17:31:27 +0800  
• 675bd555   no message Browse Code »
  陶汉栋

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

  2018-03-15 17:02:42 +0800  
• df6597cd   no message Browse Code »
  姚旭斌

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

  2018-03-15 11:50:32 +0800  
• 84aba0cd   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »
  陶汉栋

  2018-03-15 09:52:01 +0800  
• 287f1d90   no message Browse Code »
  陶汉栋

  2018-03-15 09:51:47 +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  
• 9d07eb7d   no message Browse Code »
  陶汉栋

  2018-03-15 08:59:54 +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

5 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