wang_xy 1 年之前
父节点
当前提交
242ddf1746

+ 1 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZHouseController.java

@@ -84,10 +84,8 @@ public class ZHouseController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:house:query")
     @GetMapping("/{id}")
-    public R<ZHouseVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+    public R<ZHouseVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) {
         return R.ok(iZHouseService.queryById(id));
     }
 

+ 2 - 0
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/GImportVo.java

@@ -36,6 +36,8 @@ public class GImportVo implements Serializable {
     private String idCard;
     @ExcelProperty(value = "手机号")
     private String phone;
+    @ExcelProperty(value = "现住人电话")
+    private String newPhone;
     @ExcelProperty(value = "管理所")
     private String administrative;
     @ExcelProperty(value = "来源(请填写“新增”或“一体化平台”)")

+ 1 - 0
ruoyi-zdsz/src/main/resources/mapper/zdsz/ZAreaMapper.xml

@@ -51,6 +51,7 @@
             zh.id_card AS idCard,
             zh.phone AS phone,
             zh.house_user_name AS houseUserName,
+            zh.new_phone AS newPhone,
             za.administrative,
             sdcs.dict_label AS source
         FROM