Merge branch 'master' into develop

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

@@ -161,7 +161,7 @@
          ci.phone_num, ci.remark, ci.create_time,ci.brand_logo, ci.brand_name, ci.license_img, ci.credit_code, ci.content, ci.score,ci.lon,ci.lat, ci.back_img,cm.user_account_id
         FROM company_back_user cbu INNER JOIN company_info ci ON ci.id = cbu.company_info_id
         inner join company_member cm on cm.company_info_id = ci.id
-        WHERE cbu.back_user_account_id = #{backUserAccountId} and ci.is_deleted = 0
+        WHERE cbu.back_user_account_id = #{backUserAccountId} and ci.is_deleted = 0 and cm.is_leader = 1
     </select>
 
     <select id="countCompanyBackUser" resultType="java.lang.Integer">

kustomization/overlays/prod/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/cms
-  newTag: 52c4b6cf621d5f0726c08f3bce1293c2a84321ca
+  newTag: f3514fa9e34861b618bdf7ce620af269f802b08d