From 6f266c7dbc1f843e00d4f48dfd3a61671f70e124 Mon Sep 17 00:00:00 2001 From: gongchunyi <deslre0381@gmail.com> Date: 星期日, 05 七月 2026 11:23:38 +0800 Subject: [PATCH] Merge branch 'dev_New_pro' into dev_pro_山西长治 --- sql/product-inventory-management-new-pro.sql | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/sql/product-inventory-management-new-pro.sql b/sql/product-inventory-management-new-pro.sql index 35c0008..2752b38 100644 --- a/sql/product-inventory-management-new-pro.sql +++ b/sql/product-inventory-management-new-pro.sql @@ -3299,6 +3299,10 @@ `no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '閫�璐у崟缂栧彿', `return_type` tinyint NOT NULL DEFAULT 0 COMMENT '閫�璐ф柟寮� 0閫�璐ч��娆� 1鎷掓敹', `supplier_id` bigint NOT NULL DEFAULT 0 COMMENT '渚涘簲鍟唅d', + `shipping_type` tinyint NULL DEFAULT NULL COMMENT '鍙戣揣绫诲瀷 1璐ц溅 2蹇��', + `truck_plate_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鍙戣揣杞︾墝鍙�', + `express_company` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '蹇�掑叕鍙�', + `express_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '蹇�掑崟鍙�', `project_id` bigint NOT NULL DEFAULT 0 COMMENT '椤圭洰id', `project_phase` tinyint NOT NULL DEFAULT 0 COMMENT '椤圭洰闃舵', `prepared_at` datetime NULL DEFAULT NULL COMMENT '鍒跺崟鏃ユ湡', @@ -3753,6 +3757,10 @@ `return_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '閫�璐у崟鍙�', `customer_id` bigint NULL DEFAULT NULL COMMENT '瀹㈡埛 id', `shipping_id` bigint NULL DEFAULT NULL COMMENT '鍏宠仈鍙戣揣鍗曞彿', + `shipping_type` tinyint NULL DEFAULT NULL COMMENT '鍙戣揣绫诲瀷 1璐ц溅 2蹇��', + `truck_plate_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鍙戣揣杞︾墝鍙�', + `express_company` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '蹇�掑叕鍙�', + `express_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '蹇�掑崟鍙�', `project_stage` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '椤圭洰闃舵', `maker` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鍒跺崟浜�', `make_time` timestamp NULL DEFAULT NULL COMMENT '鍒跺崟鏃堕棿', -- Gitblit v1.9.3