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

Junjie

2023-10-07 dca05a46447295fb484445c910a967fb2b107bc6

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

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

    /**
     * 入出库类型