From 474ddd0b76f343b09038e6f60e2826684d5eecd2 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 08 五月 2026 13:32:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro
---
src/main/java/com/ruoyi/basic/pojo/CustomerContact.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/CustomerContact.java b/src/main/java/com/ruoyi/basic/pojo/CustomerContact.java
index 1edc1ab..0c88abd 100644
--- a/src/main/java/com/ruoyi/basic/pojo/CustomerContact.java
+++ b/src/main/java/com/ruoyi/basic/pojo/CustomerContact.java
@@ -42,13 +42,13 @@
* 鑱旂郴浜哄悕绉�
*/
@ApiModelProperty("鑱旂郴浜哄悕绉�")
- private String contactName;
+ private String contactPerson;
/**
* 鐢佃瘽
*/
@ApiModelProperty("鐢佃瘽")
- private String phone;
+ private String contactPhone;
/**
* 鍏宠仈瀹㈡埛淇℃伅琛↖D
--
Gitblit v1.9.3