Merge branch 'dev' into dev_user0622

# Conflicts: # mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
2026-07-02 19:09:31 +08:00
parent 0d70cc8b4c c2a4b981e6
commit 176bdbc633
30 changed files with 858 additions and 246 deletions
@@ -194,4 +194,13 @@ public class MaterialInventoryDTO extends MaterialBaseDTO {
    private String productionDateStr;
    private String updateTimeStr;

+    private String expiryDateStart;
+    private String expiryDateEnd;
+
+    private String productionDateStart;
+    private String productionDateEnd;
+
+    private String updateTimeStart;
+    private String updateTimeEnd;
+
 }