Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto

whycq

2025-01-02 00620a6917d2c4b0df1f62366a489cfe6aed8be1

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

@@ -125,11 +125,11 @@

    @ApiModelProperty(value= "")
    @TableField("matnr1")
    private Integer matnr1;
    private String matnr1;

    @ApiModelProperty(value= "")
    @TableField("matnr2")
    private Integer matnr2;
    private String matnr2;

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