Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/ims into 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: 846c54b6aa6ffe9da759d7a97309f0d2efbfe82e
+  newTag: 1cf6133619607e51a0e4766694eafe6b369a2dab

release-service/src/main/java/com/mmc/csf/release/entity/curriculum/CurriculumOrderQO.java

@@ -31,6 +31,9 @@ public class CurriculumOrderQO implements Serializable {
     @ApiModelProperty(value = "订单编号")
     private String orderNo;
 
+    @ApiModelProperty
+    private Integer curriculumInfoId;
+
     public void buildCurrentPage() {
         this.pageNo = (pageNo - 1) * pageSize;
     }

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

@@ -21,6 +21,9 @@
         <if test="orderNo!=null">
             where   order_no = #{orderNo}
         </if>
+        <if test="curriculumInfoId != null">
+            and curriculum_info_id = #{curriculumInfoId}
+        </if>
     </select>
     <select id="selectOrderList" resultType="com.mmc.csf.release.entity.curriculum.CurriculumOrderDO">
         select