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

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageRespVO.java

@@ -88,4 +88,8 @@ public class StorageRespVO {
     @ExcelProperty("作废时间")
     private LocalDateTime cancelTime;
 
+    @Schema(description = "需物料名称")
+    @ExcelProperty("虚物料名称")
+    private String vMatName;
+
 }

sql/v1.3.0/1.structure.sql

@@ -68,3 +68,5 @@ CREATE TABLE `pro_process_design_progress` (
 ) ENGINE=InnoDB COMMENT='工艺设计进度表';
 
 ALTER TABLE project_deliver_order MODIFY COLUMN `deliver_mode` CHAR ( 1 ) COMMENT '发货方式';
+
+ALTER TABLE wms_storage ADD COLUMN `v_mat_name` varchar(128) COMMENT '虚拟物料名称';