Merge branch 'refs/heads/master' into xin

xin

2025-10-17 ab0637e981ab4c85120ccde35ee24ec4abbe3e24

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

@@ -24,6 +24,9 @@
    @ApiModelProperty(value = "用户类型")
    private String userType;

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

    @ApiModelProperty(value = "订单号")
    private String orderNum;
    private List<Timestamp> operationTime;