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

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

@@ -206,6 +206,7 @@
          where cm.company_info_id = #{companyInfoId} and ua.`disable` = 0
     </select>
 
+
     <select id="getAppCompanyInfoUId" resultType="com.mmc.iuav.user.entity.CompanyInfoDO">
         SELECT
             ci.id,

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: 00def15c5d8ab2b6c630e8e210de91f6bb4e435a
+  newTag: f21035fb278a63952a0d9a7dedad1145a239169c