From f3cf05b74840f57f632af858ee27aab1d937cab8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 14 三月 2026 11:47:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/basic/pojo/Customer.java | 7 +++++++
doc/宁夏-中盛建材.sql | 4 ++++
src/main/resources/application-zsjc.yml | 3 ++-
3 files changed, 13 insertions(+), 1 deletions(-)
diff --git "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql" "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
index 18b76f7..d4e3800 100644
--- "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
+++ "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
@@ -197,3 +197,7 @@
update_time DATETIME COMMENT '淇敼鏃堕棿',
tenant_id BIGINT NOT NULL COMMENT '绉熸埛ID'
) COMMENT = '鍩虹鍙傛暟瀹氫箟琛�';
+
+ALTER TABLE `product-inventory-management-zsjc`.`customer`
+ ADD COLUMN `form_instance_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '瀹滄惌琛ㄥ崟瀹炰緥ID' AFTER `customer_type`,
+ ADD COLUMN `form_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '瀹滄惌淇敼鏃堕棿' AFTER `form_instance_id`;
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 8a35b2b..595dae8 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -115,4 +115,11 @@
@ApiModelProperty(value = "寮�鎴疯鍙�")
@Excel(name = "寮�鎴疯鍙�")
private String bankCode;
+
+ @ApiModelProperty("瀹滄惌琛ㄥ崟瀹炰緥ID")
+ private String formInstanceId;
+
+ @ApiModelProperty("瀹滄惌淇敼鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime formModifiedTime;
}
diff --git a/src/main/resources/application-zsjc.yml b/src/main/resources/application-zsjc.yml
index 63ae69e..cadd994 100644
--- a/src/main/resources/application-zsjc.yml
+++ b/src/main/resources/application-zsjc.yml
@@ -32,6 +32,7 @@
app-type: "APP_UY8XMO7GNA8OF08EFNVQ"
produce-plan-form-uuid: "FORM-4IA66891C5H3QWMDBSGO05C0OX9628GRPYF7L8"
material-code-form-uuid: "FORM-8I666N718RW4ALO4ETYDDB0U6U8T3EIWTQ0ALL1"
+ customer-code-form-uuid: "FORM-4V966QC1M8B5W4Q89M1VL4ZURJ6C3FVA021ALE"
system-token: "4J766L91OFH3V612E7LG5B4DI8M13MQF9VF7LG4"
# 鎺ュ彛鍦板潃
access-token-url: "https://oapi.dingtalk.com/gettoken"
@@ -264,4 +265,4 @@
file:
temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
+ upload-dir: /javaWork/product-inventory-management/file/prod/uploads
--
Gitblit v1.9.3