Merge branch 'feature/社群' into 'developer'

Feature/社群

See merge request !524

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatServiceImpl.java

@@ -371,6 +371,7 @@ public class GroupChatServiceImpl implements GroupChatService {
                 logger.info("成员关联导购数={},商户={}", clerkList.size(), enterpriseIdSet);
                 if (enterpriseIdSet.size() == 1) {
                     enterpriseId = clerkList.get(0).getEnterpriseId();
+                    chat.setEnterpriseId(enterpriseId);
                 }
             }
         }

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

@@ -109,7 +109,7 @@
 	<update id="update" parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChat">
 	  <![CDATA[
 	  UPDATE tab_haoban_group_chat SET
-	  	  enterprise_id = #{enterprieId},
+	  	  enterprise_id = #{enterpriseId},
 		  group_chat_id=#{groupChatId},
 		  name=#{name},
 		  staff_id=#{staffId},