Merge branch 'develop'

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/ims
-  newTag: 8ff2ca9c36e2addec171e452246841c5077766a2
+  newTag: 90289e87dd4270f8e0e846168907fa68c4193eb7

release-service/src/main/resources/mapper/flyer/FlyerTrainingDao.xml

@@ -277,7 +277,7 @@
     <select id="countTwoCourseClassify" resultType="java.lang.Integer">
         SELECT COUNT(*)
         FROM course_classify
-        WHERE one_course_id = #{one_course_id} and is_deleted = 0
+        WHERE one_course_id = #{one_course_id}
     </select>
     <select id="selectCurriculumClassify"
             resultType="com.mmc.csf.release.entity.curriculum.CurriculumClassifyDO">