Merge remote-tracking branch 'origin/hcddwcs-gdfs' into hcddwcs-gdfs

hmpc

2024-11-18 6c85a6bd1ceaacd44c18bfb6a0dc3a9367d13d39

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

@@ -117,11 +117,11 @@
     */
    @ApiModelProperty(value= "工作号")
    @TableField("wrk_no")
    private Integer wrkNo;
    private Long wrkNo;

    @ApiModelProperty(value= "")
    @TableField("wrk_no1")
    private Integer wrkNo1;
    private Long wrkNo1;

    /**
     * 容器类型