Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs

zyx

2024-01-31 ca8f5a8f133e7f5b00b9d35ff6d15720804569af

 src/main/java/com/zy/asrs/entity/WrkMastLog.java

@@ -271,8 +271,8 @@
    private String manuType;

    @ApiModelProperty(value= "")
    @TableField("memo_m")
    private String memoM;
    @TableField("memo")
    private String memo;

    @ApiModelProperty(value= "")
    @TableField("sc_weight")