Merge branch 'master' into xin

xin

2025-07-21 548bead175143ab846aaf0816f2ff1129050e94a

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

@@ -26,6 +26,10 @@
    private Long logId;

    @NotBlank
    @ApiModelProperty(value = "订单号")
    private String orderNum;

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

@@ -45,17 +49,13 @@
    @ApiModelProperty(value = "备注")
    private String remark;

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

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

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

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