Merge branch 'develop'

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

@@ -159,7 +159,7 @@
     <select id="getCompanyInfoByBackUserAccountId" resultType="com.mmc.iuav.user.entity.CompanyInfoDO">
         SELECT ci.id, ci.company_type, ci.company_name, ci.full_name, ci.province, ci.city, ci.district, ci.address, ci.company_user_name,
          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_info ci INNER JOIN company_back_user cbu ON ci.id = cbu.company_info_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
     </select>

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: 74a6682b5df6db694b9806a03a4e6b8aea0321d0
+  newTag: 527be833aa267709714cdd38b753819989b59802