Merge branch 'develop' of http://git.mmcuav.cn/iuav/cms into develop

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

@@ -90,7 +90,7 @@
         select count(*) from activity
         where is_deleted = 0
         <if test="activityName != null">
-            and activity_name = #{activityName}
+            and ac.activity_name like CONCAT("%",#{activityName},"%")
         </if>
         <if test="activityType != null">
             and activity_type = #{activityType}
@@ -106,7 +106,7 @@
         from activity ac
         where ac.is_deleted = 0
         <if test="activityName != null">
-            and ac.activity_name = #{activityName}
+            and ac.activity_name like CONCAT("%",#{activityName},"%")
         </if>
         <if test="activityType != null">
             and ac.activity_type = #{activityType}

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: 10bf1d0b58cd391b87619540a4bd2160ea17eea1
+  newTag: 1c8661a16fcb38a81379f0e1a7c586a7db0dd376