Merge branch 'feature/login-token' into developer

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -415,7 +415,7 @@
         from tab_haoban_external_clerk_related
         where
         relation_key = #{relationKey}
-        and status_flag = 4
+        and status_flag = 4 order by create_time desc limit 1
     </select>
 
     <select id="listByWxEnterpriseIdAndWxUserIdAndStatus" resultMap="BaseResultMap">

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -737,6 +737,7 @@ public class WxEnterpriseController extends WebBaseController {
         welcomeDTO.setWelcomeContent(welcomeContent);
         welcomeDTO.setWelcomeImg(welcomeImg);
         welcomeDTO.setWxEnterpriseId(wxEnterpriseId);
+        welcomeDTO.setOpenFlag(1);
         wxEnterpriseApiService.saveWelcome(welcomeDTO);
         return resultResponse(HaoBanErrCode.ERR_1);
     }