Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

zyx

2023-12-25 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078

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

@@ -55,7 +55,7 @@
     */
    @ApiModelProperty(value= "工作状态")
    @TableField("wrk_sts")
    private Integer wrkSts;
    private Long wrkSts;

    /**
     * 入出库类型