Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

LSH

2023-12-02 e4d5a0e37babc1ae214c34162e58f5084927d301

 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")