From ed679ad67815b336d48bbafacd05d7dd2e1b53b1 Mon Sep 17 00:00:00 2001
From: hansha <bdqn_hansha@163.com>
Date: Tue, 26 Mar 2024 17:00:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/szxc/domain/SzxcHkbgRecard.java     |  4 ++--
 ruoyi-ui/src/views/szxc/recard/index.vue               | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHkbgRecard.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHkbgRecard.java
index 1b6312e..ffddd6c 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHkbgRecard.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHkbgRecard.java
@@ -53,8 +53,8 @@ public class SzxcHkbgRecard extends BaseEntity
     @Excel(name = "变更原因(字典)")
     private String bgReason;
 
-    /** 原居民id */
-    @Excel(name = "原居民id")
+    /** 新居民id */
+    @Excel(name = "新居民id")
     private Long xJmId;
 
     /** 新户主姓名 */
diff --git a/ruoyi-ui/src/views/szxc/recard/index.vue b/ruoyi-ui/src/views/szxc/recard/index.vue
index cd5e0e1..541754d 100644
--- a/ruoyi-ui/src/views/szxc/recard/index.vue
+++ b/ruoyi-ui/src/views/szxc/recard/index.vue
@@ -65,10 +65,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="原居民id" prop="xJmId">
+      <el-form-item label="新居民id" prop="xJmId">
         <el-input
           v-model="queryParams.xJmId"
-          placeholder="请输入原居民id"
+          placeholder="请输入新居民id"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -192,7 +192,7 @@
       <el-table-column label="原户主姓名" align="center" prop="yName" />
       <el-table-column label="原户主身份证号" align="center" prop="yIdCard" />
       <el-table-column label="变更原因(字典)" align="center" prop="bgReason" />
-      <el-table-column label="原居民id" align="center" prop="xJmId" />
+      <el-table-column label="新居民id" align="center" prop="xJmId" />
       <el-table-column label="新户主姓名" align="center" prop="xName" />
       <el-table-column label="新户主身份证号" align="center" prop="xIdCard" />
       <el-table-column label="与户主关系" align="center" prop="relation" />
@@ -260,8 +260,8 @@
         <el-form-item label="变更原因(字典)" prop="bgReason">
           <el-input v-model="form.bgReason" placeholder="请输入变更原因(字典)" />
         </el-form-item>
-        <el-form-item label="原居民id" prop="xJmId">
-          <el-input v-model="form.xJmId" placeholder="请输入原居民id" />
+        <el-form-item label="新居民id" prop="xJmId">
+          <el-input v-model="form.xJmId" placeholder="请输入新居民id" />
         </el-form-item>
         <el-form-item label="新户主姓名" prop="xName">
           <el-input v-model="form.xName" placeholder="请输入新户主姓名" />