22 Mar, 2018

17 commits

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

  2018-03-22 18:09:01 +0800  
• cc9bfb52   no message Browse Dir »
  陶汉栋

  2018-03-22 18:08:54 +0800  
• 0f4158c7   no message Browse Dir »
  姚旭斌

  2018-03-22 17:03:19 +0800  
• ae9a2c2f   no message Browse Dir »
  陶汉栋

  2018-03-22 16:51:54 +0800  
• ce7abc12   no message Browse Dir »
  陶汉栋

  2018-03-22 16:49:53 +0800  
• 05344cfa   no message Browse Dir »
  陶汉栋

  2018-03-22 16:29:00 +0800  
• f9d17f1b   no message Browse Dir »
  姚旭斌

  2018-03-22 16:20:26 +0800  
• e618cea0   no message Browse Dir »
  陶汉栋

  2018-03-22 15:58:16 +0800  
• 57dfbdb6   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-22 15:53:45 +0800  
• 252d2ee0   no message Browse Dir »
  姚旭斌

  2018-03-22 15:53:31 +0800  
• 432b4257   no message Browse Dir »
  陶汉栋

  2018-03-22 15:36:10 +0800  
• de5c40dd   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # 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  
• 49d6fe65   no message Browse Dir »
  陶汉栋

  2018-03-22 11:39:15 +0800  
• 2a83582a   no message Browse Dir »
  姚旭斌

  2018-03-22 11:37:04 +0800  
• 50ca3597   no message Browse Dir »
  张道锋

  2018-03-22 11:06:39 +0800  
• 7fa6a0f8   no message Browse Dir »
  姚旭斌

  2018-03-22 09:52:12 +0800  
• 9b095404   no message Browse Dir »
  陶汉栋

  2018-03-22 09:51:22 +0800  

21 Mar, 2018

13 commits

• 3909048b   no message Browse Dir »
  姚旭斌

  2018-03-21 17:03:10 +0800  
• fbd004dd   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-21 16:41:47 +0800  
• ccad9511   no message Browse Dir »
  姚旭斌

  2018-03-21 16:41:33 +0800  
• 2f0e5240   no message Browse Dir »
  陶汉栋

  2018-03-21 15:45:26 +0800  
• ec30fab4   no message Browse Dir »
  陶汉栋

  2018-03-21 15:43:34 +0800  
• d045d156   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-21 15:26:55 +0800  
• d7705ead   no message Browse Dir »
  姚旭斌

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

  2018-03-21 14:42:38 +0800  
• 7ffbaef3   no message Browse Dir »
  陶汉栋

  2018-03-21 09:59:35 +0800  
• 561e50fc   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-21 09:52:55 +0800  
• 724a75c0   no message Browse Dir »
  陶汉栋

  2018-03-21 09:52:37 +0800  
• 5f67acc0   Merge branch 'developer' into yxb_dev ... Browse Dir »

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

  姚旭斌

  2018-03-21 09:25:50 +0800  
• 10a30b8e   no message Browse Dir »
  姚旭斌

  2018-03-21 09:23:27 +0800  

20 Mar, 2018

10 commits

• e3be68e6   no message Browse Dir »
  陶汉栋

  2018-03-20 18:02:30 +0800  
• 68baa86d   no message Browse Dir »
  陶汉栋

  2018-03-20 17:59:23 +0800  
• b452c5b0   no message Browse Dir »
  陶汉栋

  2018-03-20 17:55:21 +0800  
• 9ffe80e9   no message Browse Dir »
  陶汉栋

  2018-03-20 17:33:35 +0800  
• 9ef200d2   no message Browse Dir »
  陶汉栋

  2018-03-20 17:26:09 +0800  
• ae079afc   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultTwoLevelFragment.java
  #	app/src/main/res/layout/activity_consult_two_level.xml
  #	app/src/main/res/layout/fragment_zi_xun.xml

  姚旭斌

  2018-03-20 17:21:41 +0800  
• 81d7f8c8   no message Browse Dir »
  姚旭斌

  2018-03-20 17:12:23 +0800  
• 0118d641   no message Browse Dir »
  陶汉栋

  2018-03-20 16:51:55 +0800  
• 6a922153   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-20 14:40:50 +0800  
• c8a5db9f   no message Browse Dir »
  陶汉栋

  2018-03-20 14:40:19 +0800