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

202408/南网仓储/receive_detail_20240812.sql

@@ -0,0 +1,36 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 192.168.0.14_sgzb_2009
+ Source Server Type    : MySQL
+ Source Server Version : 80200
+ Source Host           : 192.168.0.14:2009
+ Source Schema         : ma_sgzb_cq
+
+ Target Server Type    : MySQL
+ Target Server Version : 80200
+ File Encoding         : 65001
+
+ Date: 12/08/2024 12:34:10
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for receive_detail
+-- ----------------------------
+DROP TABLE IF EXISTS `receive_detail`;
+CREATE TABLE `receive_detail`  (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `type_id` int NULL DEFAULT NULL COMMENT '类型名称',
+  `out_num` int NULL DEFAULT NULL COMMENT '出库数量',
+  `pick_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '领料人员',
+  `out_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出库人员',
+  `out_time` datetime NULL DEFAULT NULL COMMENT '出库时间',
+  `parent_id` int NULL DEFAULT NULL COMMENT '出库父id',
+  `type` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '1出库 2退库',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 64 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;

202408/重庆机具/customerId_20240813.sql

@@ -0,0 +1,7 @@
+-- 所属组织id
+alter table sys_dept
+    add company_id bigint null comment '所属组织id';
+
+-- 所属组织id
+alter table sys_user
+    add company_id bigint null comment '所属组织id';