Merge branch 'refs/heads/master' into xin

xin

2025-09-17 6d31d535d737ed26c4d9d61cd4e0b5483cb9b0ba

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

@@ -42,6 +42,10 @@
    private Integer operation = 0;

    @NotBlank
    @ApiModelProperty(value = "类型")
    private String operationType;

    @NotBlank
    @ApiModelProperty(value = "用户操作描述")
    private String operationDescribe = "提交订单";