Merge branch 'develop'

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CooperationServiceImpl.java

@@ -277,6 +277,7 @@ public class CooperationServiceImpl implements CooperationService {
         CompanyInfoDO companyInfoDO = companyDao.getAppCompanyInfoUId(userApplyTag.getUserAccountId());
         CompanyInfoDO companyInfoDO1 = new CompanyInfoDO(applyTagEditVO);
         companyInfoDO1.setId(companyInfoDO.getId());
+        companyInfoDO1.setBrandLogo(applyTagEditVO.getBrandLogo());
         companyDao.updateCompanyInfo(companyInfoDO1);
         return ResultBody.success();
     }

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

@@ -278,4 +278,4 @@
             company_member cm
         where company_info_id = #{companyInfoId} and is_leader = 1
     </select>
-</mapper>
\ No newline at end of file
+</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: d190450dfd080c768e616a14db28f63eb2aac985
+  newTag: 29ee7f3da55705f8f2e5bdef746c1756c1ce8fef