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: 7162d642151a36be1c2cfb9892bf1c8cd47fb1c5
+  newTag: b6a25d9c83b2dded31840a6c9b27e40b72489cb0

release-service/src/main/java/com/mmc/csf/release/controller/FlyerTrainingController.java

@@ -5,7 +5,6 @@ import com.mmc.csf.common.util.math.CodeUtil;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.release.entity.curriculum.CurriculumInfoDO;
 import com.mmc.csf.release.entity.curriculum.CurriculumOrderDO;
-import com.mmc.csf.release.entity.curriculum.CurriculumOrderDO;
 import com.mmc.csf.release.entity.curriculum.CurriculumOrderQO;
 import com.mmc.csf.release.feign.PmsAppApi;
 import com.mmc.csf.release.feign.UserAppApi;

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

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