Merge branch 'master' into xin

xin

2025-09-04 d70c240e09a9021824cc9e9f1bed8028a0c194cd

 oying-system/src/main/java/com/oying/modules/sh/domain/request/SubmitOrder.java

@@ -32,7 +32,7 @@
    private List<ProductOrder> products;
    @ApiModelProperty(value = "备注")
    private String remark;
    @NotBlank(message = "支付类型不能为空")
    @NotNull(message = "支付类型不能为空")
    @ApiModelProperty(value = "支付类型")
    private PayTypeEnum payType;