Merge branch 'refs/heads/dev'

# Conflicts: # eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
2024-08-01 18:10:07 +08:00
parent 420c52abbc 25b4a4ca2f
commit cdceb51f92
30 changed files with 95 additions and 42 deletions
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/StockCountDTO.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/StockCountDTO.java
@@ -17,4 +17,5 @@ public class StockCountDTO {
    private String specSnap;
    private Integer stockCount;
    private Integer stockNumber;
+    private String specSnap;
 }