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

野心家

2023-09-01 1dbdcf2bf037a06f0a498c84520c8d75ca8de1c0

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

@@ -150,7 +150,7 @@
    @TableField("error_memo")
    private String errorMemo;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "是否启动1，0")
    @TableField("ctn_kind")
    private Integer ctnKind;