合并代码，解决冲突

zhangchao

2024-11-02 f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae

 src/main/java/com/zy/common/service/wms/ReplenishDto.java

@@ -12,4 +12,6 @@

    private Double count;

    private Integer workNo;

}