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

lty

2025-03-24 cf9fac40a8e39b25ee935a743224ae6c405bbddc

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