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

csm-service/cms-service-user/src/main/resources/mapper/CompanyDao.xml

@@ -331,6 +331,6 @@
     <select id="getCompanyTagId" resultType="java.lang.Integer">
         select cooperation_tag_id from company_member cm
                                            left join user_tag ut on cm.user_account_id = ut.user_account_id
-        WHERE cm.is_leader = 1 and cm.company_info_id = #{id}
+        WHERE cm.is_leader = 1 and cm.company_info_id = #{id} 	LIMIT 1
     </select>
 </mapper>

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 8c54efeae0cf88b5b4395abf655df377a7974429
+  newTag: 4eeff7395fb5a906e914c8ea03e29bc4aed9f0ff