Merge branch 'develop'

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

@@ -218,7 +218,7 @@
     </select>
 
     <select id="getCompanyBackUserByCompanyId" resultType="com.mmc.iuav.user.entity.CompanyBackUserDO">
-        select id, back_user_account_id, company_info_id from company_back_user where company_info_id = #{companyInfoId}
+        select id, back_user_account_id, company_info_id from company_back_user where company_info_id = #{companyInfoId} limit 1
     </select>
 
     <select id="getCompanyBackUserByBackUserId" resultType="com.mmc.iuav.user.entity.CompanyBackUserDO">

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: 824ca16614a0418700acadab8eb61cc89b10e18d
+  newTag: 483af31aa68c82799c8554fe778ce23f35088b8b