Merge branch 'xin' into pxb

彭雪彬

2025-07-15 a7501803a3ca43310e57a5dd912e5047919c2e43

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

@@ -25,33 +25,37 @@
    @ApiModelProperty(value = "主键")
    private Long logId;

    @NotNull
    @ApiModelProperty(value = "用户id")
    private Long userId;
    @NotBlank
    @ApiModelProperty(value = "订单号")
    private String orderNum;

    @NotBlank
    @ApiModelProperty(value = "用户账号")
    private String username;

    @NotBlank
    @ApiModelProperty(value = "用户类型")
    private String userType;

    @NotBlank
    @NotNull
    @ApiModelProperty(value = "用户操作")
    private String operation;
    private Integer operation = 0;

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

    @NotBlank
    @ApiModelProperty(value = "备注")
    private String remark;

    @NotNull
    @NotBlank
    @ApiModelProperty(value = "操作时的订单快照")
    private String snapshotData;

    @NotNull
    @ApiModelProperty(value = "操作时间")
    private Timestamp operationTime;

    @NotNull
    @ApiModelProperty(value = "订单号")
    private Long orderNum;

    public void copy(OrderOperationLog source){
        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));