Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java

@@ -267,18 +267,18 @@ public class TestController extends WebBaseController {
 
     @RequestMapping("/get-cache")
     @ResponseBody
-    public String getCache(String key) {
+    public Object getCache(String key) {
         Object o = RedisUtil.getCache(key) ;
-        return o.toString() ;
+        return o ;
     }
 
     @RequestMapping("/del-cache")
     @ResponseBody
-    public String delCache(String key) {
+    public Object delCache(String key) {
         Object o = RedisUtil.getCache(key) ;
         if(null != o) {
             RedisUtil.delCache(key);
         }
-        return o.toString() ;
+        return o ;
     }
 }

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatUserMapper.xml

@@ -241,6 +241,7 @@
 			a.invitor_user_id invitorUserId,
 			a.invitor_user_name invitorUserName ,
 			a.user_quit_time userQuitTime,
+			a.quit_staff_store quitStaffStore ,
 			a.join_scene joinScene,
 			a.join_state joinState 
 			from tab_haoban_group_chat_user a
@@ -305,7 +306,7 @@
 	</select>
 
 	<select id="listQuitNum" resultType="com.gic.haoban.manage.service.pojo.bo.chat.UserQuitBO">
-		select quit_staff_id , count(*) from tab_haoban_group_chat_user where wx_enterprise_id=#{wxEnterpriseId} and user_quit_time >= #{start}
+		select quit_staff_id staffId , count(*) num from tab_haoban_group_chat_user where wx_enterprise_id=#{wxEnterpriseId} and user_quit_time >= #{start}
 		and user_quit_time <![CDATA[<=]]> #{end} and status_flag = 2 group by quit_staff_id
 	</select>