Merge remote-tracking branch 'origin/main'

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcDyManage.java

@@ -21,8 +21,8 @@ public class SzxcDyManage extends BaseEntity
     /** id */
     private Long id;
 
-    /** 巡查对像id */
+    /** 居民id */
-    @Excel(name = "巡查对像id")
+    @Excel(name = "居民id")
     private Long jmId;
 
     /** 姓名 */

ruoyi-ui/src/views/szxc/dymanage/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="巡查对像id" prop="jmId">
+      <el-form-item label="居民id" prop="jmId">
         <el-input
           v-model="queryParams.jmId"
-          placeholder="请输入巡查对像id"
+          placeholder="请输入居民id"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -144,7 +144,7 @@
     <el-table v-loading="loading" :data="dymanageList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="巡查对像id" align="center" prop="jmId" />
+      <el-table-column label="居民id" align="center" prop="jmId" />
       <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="身份证号" align="center" prop="cardId" />
       <el-table-column label="手机号" align="center" prop="phone" />
@@ -180,7 +180,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -192,8 +192,8 @@
     <!-- 添加或修改党员管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="巡查对像id" prop="jmId">
+        <el-form-item label="居民id" prop="jmId">
-          <el-input v-model="form.jmId" placeholder="请输入巡查对像id" />
+          <el-input v-model="form.jmId" placeholder="请输入居民id" />
         </el-form-item>
         <el-form-item label="姓名" prop="name">
           <el-input v-model="form.name" placeholder="请输入姓名" />