diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
index 2d9a83d..0a6e074 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.base.response.SuccessResponseData;
@@ -64,7 +63,8 @@
         Page<AppDeviceAdd> page = new PageFactory<AppDeviceAdd>().defaultPage();
         EntityWrapper<AppDeviceAdd> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(devcode) && (!(specialStr.equals(devcode)))) {
-            query.like("devcode", devcode);
+            query.andNew().like("devcode", devcode).or().like("wellcode", devcode);
+//            query.like("devcode", devcode);
         }
         if (ToolUtil.isNotEmpty(installtimeFmt) && (!(specialStr.equals(installtimeFmt)))) {
             String startTime = installtimeFmt.split("~")[0].trim();
@@ -135,11 +135,11 @@
     @ResponseBody
     public Object update(AppDeviceLog appDeviceLog) {
         String pattern = "^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?$";
-        if(appDeviceLog.getLatitude84().matches(pattern)
-                &&appDeviceLog.getLatitude().matches(pattern)){
+        if (appDeviceLog.getLatitude84().matches(pattern)
+                && appDeviceLog.getLatitude().matches(pattern)) {
             appDeviceLogService.updateById(appDeviceLog);
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("传入的经度、纬度坐标格式不正确，必须为数字，请重新输入");
         }
     }
@@ -201,7 +201,7 @@
                 appDeviceLog.setPhotopath2("");
             } else if ("2".equals(pathIndex)) {
                 appDeviceLog.setPhotopath3("");
-            }else if ("3".equals(pathIndex)) {
+            } else if ("3".equals(pathIndex)) {
                 appDeviceLog.setPhotopath4("");
             } else if ("4".equals(pathIndex)) {
                 appDeviceLog.setPhotopath5("");
@@ -242,9 +242,9 @@
         }
         query.orderBy("createtime", false);
         page = appDeviceLogService.selectPage(page, query);
-        List<AppDeviceLog> appDeviceLogList=page.getRecords();
+        List<AppDeviceLog> appDeviceLogList = page.getRecords();
         appDeviceLogList.forEach(appDeviceLog -> {
-            appDeviceLog.setWelltype(permissionService.getDictNameByCode("sluicewellType",appDeviceLog.getWelltype()));
+            appDeviceLog.setWelltype(permissionService.getDictNameByCode("sluicewellType", appDeviceLog.getWelltype()));
         });
         return new SuccessResponseData(super.packForBT(page));
     }
@@ -260,7 +260,7 @@
         List<AppDeviceLog> list = appDeviceLogService.reportExport(devcode, devtype,
                 begTime, endTime, project, installPerson);
         list.forEach(AppDeviceLog -> {
-            AppDeviceLog.setWelltype( permissionService.getDictNameByCode("sluicewellType",AppDeviceLog.getWelltype()));
+            AppDeviceLog.setWelltype(permissionService.getDictNameByCode("sluicewellType", AppDeviceLog.getWelltype()));
         });
 
         List<Object> res = new ArrayList<>();

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
index 2d9a83d..0a6e074 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.base.response.SuccessResponseData;
@@ -64,7 +63,8 @@
         Page<AppDeviceAdd> page = new PageFactory<AppDeviceAdd>().defaultPage();
         EntityWrapper<AppDeviceAdd> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(devcode) && (!(specialStr.equals(devcode)))) {
-            query.like("devcode", devcode);
+            query.andNew().like("devcode", devcode).or().like("wellcode", devcode);
+//            query.like("devcode", devcode);
         }
         if (ToolUtil.isNotEmpty(installtimeFmt) && (!(specialStr.equals(installtimeFmt)))) {
             String startTime = installtimeFmt.split("~")[0].trim();
@@ -135,11 +135,11 @@
     @ResponseBody
     public Object update(AppDeviceLog appDeviceLog) {
         String pattern = "^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?$";
-        if(appDeviceLog.getLatitude84().matches(pattern)
-                &&appDeviceLog.getLatitude().matches(pattern)){
+        if (appDeviceLog.getLatitude84().matches(pattern)
+                && appDeviceLog.getLatitude().matches(pattern)) {
             appDeviceLogService.updateById(appDeviceLog);
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("传入的经度、纬度坐标格式不正确，必须为数字，请重新输入");
         }
     }
@@ -201,7 +201,7 @@
                 appDeviceLog.setPhotopath2("");
             } else if ("2".equals(pathIndex)) {
                 appDeviceLog.setPhotopath3("");
-            }else if ("3".equals(pathIndex)) {
+            } else if ("3".equals(pathIndex)) {
                 appDeviceLog.setPhotopath4("");
             } else if ("4".equals(pathIndex)) {
                 appDeviceLog.setPhotopath5("");
@@ -242,9 +242,9 @@
         }
         query.orderBy("createtime", false);
         page = appDeviceLogService.selectPage(page, query);
-        List<AppDeviceLog> appDeviceLogList=page.getRecords();
+        List<AppDeviceLog> appDeviceLogList = page.getRecords();
         appDeviceLogList.forEach(appDeviceLog -> {
-            appDeviceLog.setWelltype(permissionService.getDictNameByCode("sluicewellType",appDeviceLog.getWelltype()));
+            appDeviceLog.setWelltype(permissionService.getDictNameByCode("sluicewellType", appDeviceLog.getWelltype()));
         });
         return new SuccessResponseData(super.packForBT(page));
     }
@@ -260,7 +260,7 @@
         List<AppDeviceLog> list = appDeviceLogService.reportExport(devcode, devtype,
                 begTime, endTime, project, installPerson);
         list.forEach(AppDeviceLog -> {
-            AppDeviceLog.setWelltype( permissionService.getDictNameByCode("sluicewellType",AppDeviceLog.getWelltype()));
+            AppDeviceLog.setWelltype(permissionService.getDictNameByCode("sluicewellType", AppDeviceLog.getWelltype()));
         });
 
         List<Object> res = new ArrayList<>();
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java
index e580166..61db0e5 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java
@@ -16,4 +16,5 @@
     private String role;
     private String salt;
     private String status;
+    private String configProject;
 }

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
index 2d9a83d..0a6e074 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.base.response.SuccessResponseData;
@@ -64,7 +63,8 @@
         Page<AppDeviceAdd> page = new PageFactory<AppDeviceAdd>().defaultPage();
         EntityWrapper<AppDeviceAdd> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(devcode) && (!(specialStr.equals(devcode)))) {
-            query.like("devcode", devcode);
+            query.andNew().like("devcode", devcode).or().like("wellcode", devcode);
+//            query.like("devcode", devcode);
         }
         if (ToolUtil.isNotEmpty(installtimeFmt) && (!(specialStr.equals(installtimeFmt)))) {
             String startTime = installtimeFmt.split("~")[0].trim();
@@ -135,11 +135,11 @@
     @ResponseBody
     public Object update(AppDeviceLog appDeviceLog) {
         String pattern = "^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?$";
-        if(appDeviceLog.getLatitude84().matches(pattern)
-                &&appDeviceLog.getLatitude().matches(pattern)){
+        if (appDeviceLog.getLatitude84().matches(pattern)
+                && appDeviceLog.getLatitude().matches(pattern)) {
             appDeviceLogService.updateById(appDeviceLog);
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("传入的经度、纬度坐标格式不正确，必须为数字，请重新输入");
         }
     }
@@ -201,7 +201,7 @@
                 appDeviceLog.setPhotopath2("");
             } else if ("2".equals(pathIndex)) {
                 appDeviceLog.setPhotopath3("");
-            }else if ("3".equals(pathIndex)) {
+            } else if ("3".equals(pathIndex)) {
                 appDeviceLog.setPhotopath4("");
             } else if ("4".equals(pathIndex)) {
                 appDeviceLog.setPhotopath5("");
@@ -242,9 +242,9 @@
         }
         query.orderBy("createtime", false);
         page = appDeviceLogService.selectPage(page, query);
-        List<AppDeviceLog> appDeviceLogList=page.getRecords();
+        List<AppDeviceLog> appDeviceLogList = page.getRecords();
         appDeviceLogList.forEach(appDeviceLog -> {
-            appDeviceLog.setWelltype(permissionService.getDictNameByCode("sluicewellType",appDeviceLog.getWelltype()));
+            appDeviceLog.setWelltype(permissionService.getDictNameByCode("sluicewellType", appDeviceLog.getWelltype()));
         });
         return new SuccessResponseData(super.packForBT(page));
     }
@@ -260,7 +260,7 @@
         List<AppDeviceLog> list = appDeviceLogService.reportExport(devcode, devtype,
                 begTime, endTime, project, installPerson);
         list.forEach(AppDeviceLog -> {
-            AppDeviceLog.setWelltype( permissionService.getDictNameByCode("sluicewellType",AppDeviceLog.getWelltype()));
+            AppDeviceLog.setWelltype(permissionService.getDictNameByCode("sluicewellType", AppDeviceLog.getWelltype()));
         });
 
         List<Object> res = new ArrayList<>();
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java
index e580166..61db0e5 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java
@@ -16,4 +16,5 @@
     private String role;
     private String salt;
     private String status;
+    private String configProject;
 }
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
index 31939d8..d070dcb 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
@@ -152,6 +152,12 @@
      */
     private String devicetype;
 
+
+    /**
+     * 安装情况,1、初次安装；2、初次拆走；3、二次安装；4、正在维护；5、其他
+     */
+    private String installType;
+
     @TableField(exist = false)
     private String installtimeFmt;
 
@@ -167,6 +173,14 @@
         this.id = id;
     }
 
+    public String getInstallType() {
+        return installType;
+    }
+
+    public void setInstallType(String installType) {
+        this.installType = installType;
+    }
+
     public String getDevcode() {
         return devcode;
     }
@@ -456,6 +470,7 @@
         appDeviceAdd.area = appDeviceLog.getArea();
         appDeviceAdd.street = appDeviceLog.getStreet();
         appDeviceAdd.wellname = appDeviceLog.getWellname();
+        appDeviceAdd.installType = appDeviceLog.getInstallType();
 //        appDeviceAdd.latitude84 = appDeviceLog.getLatitude84();
 //        appDeviceAdd.longitude84 = appDeviceLog.getLongitude84();
         //转换火星坐标系至ws84坐标

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
index 2d9a83d..0a6e074 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.base.response.SuccessResponseData;
@@ -64,7 +63,8 @@
         Page<AppDeviceAdd> page = new PageFactory<AppDeviceAdd>().defaultPage();
         EntityWrapper<AppDeviceAdd> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(devcode) && (!(specialStr.equals(devcode)))) {
-            query.like("devcode", devcode);
+            query.andNew().like("devcode", devcode).or().like("wellcode", devcode);
+//            query.like("devcode", devcode);
         }
         if (ToolUtil.isNotEmpty(installtimeFmt) && (!(specialStr.equals(installtimeFmt)))) {
             String startTime = installtimeFmt.split("~")[0].trim();
@@ -135,11 +135,11 @@
     @ResponseBody
     public Object update(AppDeviceLog appDeviceLog) {
         String pattern = "^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?$";
-        if(appDeviceLog.getLatitude84().matches(pattern)
-                &&appDeviceLog.getLatitude().matches(pattern)){
+        if (appDeviceLog.getLatitude84().matches(pattern)
+                && appDeviceLog.getLatitude().matches(pattern)) {
             appDeviceLogService.updateById(appDeviceLog);
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("传入的经度、纬度坐标格式不正确，必须为数字，请重新输入");
         }
     }
@@ -201,7 +201,7 @@
                 appDeviceLog.setPhotopath2("");
             } else if ("2".equals(pathIndex)) {
                 appDeviceLog.setPhotopath3("");
-            }else if ("3".equals(pathIndex)) {
+            } else if ("3".equals(pathIndex)) {
                 appDeviceLog.setPhotopath4("");
             } else if ("4".equals(pathIndex)) {
                 appDeviceLog.setPhotopath5("");
@@ -242,9 +242,9 @@
         }
         query.orderBy("createtime", false);
         page = appDeviceLogService.selectPage(page, query);
-        List<AppDeviceLog> appDeviceLogList=page.getRecords();
+        List<AppDeviceLog> appDeviceLogList = page.getRecords();
         appDeviceLogList.forEach(appDeviceLog -> {
-            appDeviceLog.setWelltype(permissionService.getDictNameByCode("sluicewellType",appDeviceLog.getWelltype()));
+            appDeviceLog.setWelltype(permissionService.getDictNameByCode("sluicewellType", appDeviceLog.getWelltype()));
         });
         return new SuccessResponseData(super.packForBT(page));
     }
@@ -260,7 +260,7 @@
         List<AppDeviceLog> list = appDeviceLogService.reportExport(devcode, devtype,
                 begTime, endTime, project, installPerson);
         list.forEach(AppDeviceLog -> {
-            AppDeviceLog.setWelltype( permissionService.getDictNameByCode("sluicewellType",AppDeviceLog.getWelltype()));
+            AppDeviceLog.setWelltype(permissionService.getDictNameByCode("sluicewellType", AppDeviceLog.getWelltype()));
         });
 
         List<Object> res = new ArrayList<>();
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java
index e580166..61db0e5 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java
@@ -16,4 +16,5 @@
     private String role;
     private String salt;
     private String status;
+    private String configProject;
 }
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
index 31939d8..d070dcb 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
@@ -152,6 +152,12 @@
      */
     private String devicetype;
 
+
+    /**
+     * 安装情况,1、初次安装；2、初次拆走；3、二次安装；4、正在维护；5、其他
+     */
+    private String installType;
+
     @TableField(exist = false)
     private String installtimeFmt;
 
@@ -167,6 +173,14 @@
         this.id = id;
     }
 
+    public String getInstallType() {
+        return installType;
+    }
+
+    public void setInstallType(String installType) {
+        this.installType = installType;
+    }
+
     public String getDevcode() {
         return devcode;
     }
@@ -456,6 +470,7 @@
         appDeviceAdd.area = appDeviceLog.getArea();
         appDeviceAdd.street = appDeviceLog.getStreet();
         appDeviceAdd.wellname = appDeviceLog.getWellname();
+        appDeviceAdd.installType = appDeviceLog.getInstallType();
 //        appDeviceAdd.latitude84 = appDeviceLog.getLatitude84();
 //        appDeviceAdd.longitude84 = appDeviceLog.getLongitude84();
         //转换火星坐标系至ws84坐标
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java
index c615d8a..e714696 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java
@@ -150,6 +150,10 @@
     @TableField(exist = false)
     private String installtimeFmt;
 
+    /**
+     * 安装情况,1、初次安装；2、初次拆走；3、二次安装；4、正在维护；5、其他
+     */
+    private String installType;
 
     public Long getId() {
         return id;
@@ -159,6 +163,14 @@
         this.id = id;
     }
 
+    public String getInstallType() {
+        return installType;
+    }
+
+    public void setInstallType(String installType) {
+        this.installType = installType;
+    }
+
     public String getDevcode() {
         return devcode;
     }
@@ -445,6 +457,7 @@
         this.street = appDeviceAdd.getStreet();
         this.latitude84 = appDeviceAdd.getLatitude84();
         this.longitude84 = appDeviceAdd.getLongitude84();
+        this.installType = appDeviceAdd.getInstallType();
 
     }
 }

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
index 2d9a83d..0a6e074 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.base.response.SuccessResponseData;
@@ -64,7 +63,8 @@
         Page<AppDeviceAdd> page = new PageFactory<AppDeviceAdd>().defaultPage();
         EntityWrapper<AppDeviceAdd> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(devcode) && (!(specialStr.equals(devcode)))) {
-            query.like("devcode", devcode);
+            query.andNew().like("devcode", devcode).or().like("wellcode", devcode);
+//            query.like("devcode", devcode);
         }
         if (ToolUtil.isNotEmpty(installtimeFmt) && (!(specialStr.equals(installtimeFmt)))) {
             String startTime = installtimeFmt.split("~")[0].trim();
@@ -135,11 +135,11 @@
     @ResponseBody
     public Object update(AppDeviceLog appDeviceLog) {
         String pattern = "^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?$";
-        if(appDeviceLog.getLatitude84().matches(pattern)
-                &&appDeviceLog.getLatitude().matches(pattern)){
+        if (appDeviceLog.getLatitude84().matches(pattern)
+                && appDeviceLog.getLatitude().matches(pattern)) {
             appDeviceLogService.updateById(appDeviceLog);
             return ResponseData.success();
-        }else {
+        } else {
             return ResponseData.error("传入的经度、纬度坐标格式不正确，必须为数字，请重新输入");
         }
     }
@@ -201,7 +201,7 @@
                 appDeviceLog.setPhotopath2("");
             } else if ("2".equals(pathIndex)) {
                 appDeviceLog.setPhotopath3("");
-            }else if ("3".equals(pathIndex)) {
+            } else if ("3".equals(pathIndex)) {
                 appDeviceLog.setPhotopath4("");
             } else if ("4".equals(pathIndex)) {
                 appDeviceLog.setPhotopath5("");
@@ -242,9 +242,9 @@
         }
         query.orderBy("createtime", false);
         page = appDeviceLogService.selectPage(page, query);
-        List<AppDeviceLog> appDeviceLogList=page.getRecords();
+        List<AppDeviceLog> appDeviceLogList = page.getRecords();
         appDeviceLogList.forEach(appDeviceLog -> {
-            appDeviceLog.setWelltype(permissionService.getDictNameByCode("sluicewellType",appDeviceLog.getWelltype()));
+            appDeviceLog.setWelltype(permissionService.getDictNameByCode("sluicewellType", appDeviceLog.getWelltype()));
         });
         return new SuccessResponseData(super.packForBT(page));
     }
@@ -260,7 +260,7 @@
         List<AppDeviceLog> list = appDeviceLogService.reportExport(devcode, devtype,
                 begTime, endTime, project, installPerson);
         list.forEach(AppDeviceLog -> {
-            AppDeviceLog.setWelltype( permissionService.getDictNameByCode("sluicewellType",AppDeviceLog.getWelltype()));
+            AppDeviceLog.setWelltype(permissionService.getDictNameByCode("sluicewellType", AppDeviceLog.getWelltype()));
         });
 
         List<Object> res = new ArrayList<>();
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java
index e580166..61db0e5 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserSaveDTO.java
@@ -16,4 +16,5 @@
     private String role;
     private String salt;
     private String status;
+    private String configProject;
 }
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
index 31939d8..d070dcb 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
@@ -152,6 +152,12 @@
      */
     private String devicetype;
 
+
+    /**
+     * 安装情况,1、初次安装；2、初次拆走；3、二次安装；4、正在维护；5、其他
+     */
+    private String installType;
+
     @TableField(exist = false)
     private String installtimeFmt;
 
@@ -167,6 +173,14 @@
         this.id = id;
     }
 
+    public String getInstallType() {
+        return installType;
+    }
+
+    public void setInstallType(String installType) {
+        this.installType = installType;
+    }
+
     public String getDevcode() {
         return devcode;
     }
@@ -456,6 +470,7 @@
         appDeviceAdd.area = appDeviceLog.getArea();
         appDeviceAdd.street = appDeviceLog.getStreet();
         appDeviceAdd.wellname = appDeviceLog.getWellname();
+        appDeviceAdd.installType = appDeviceLog.getInstallType();
 //        appDeviceAdd.latitude84 = appDeviceLog.getLatitude84();
 //        appDeviceAdd.longitude84 = appDeviceLog.getLongitude84();
         //转换火星坐标系至ws84坐标
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java
index c615d8a..e714696 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceLog.java
@@ -150,6 +150,10 @@
     @TableField(exist = false)
     private String installtimeFmt;
 
+    /**
+     * 安装情况,1、初次安装；2、初次拆走；3、二次安装；4、正在维护；5、其他
+     */
+    private String installType;
 
     public Long getId() {
         return id;
@@ -159,6 +163,14 @@
         this.id = id;
     }
 
+    public String getInstallType() {
+        return installType;
+    }
+
+    public void setInstallType(String installType) {
+        this.installType = installType;
+    }
+
     public String getDevcode() {
         return devcode;
     }
@@ -445,6 +457,7 @@
         this.street = appDeviceAdd.getStreet();
         this.latitude84 = appDeviceAdd.getLatitude84();
         this.longitude84 = appDeviceAdd.getLongitude84();
+        this.installType = appDeviceAdd.getInstallType();
 
     }
 }
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java
index 45decec..a1ca96c 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppUser.java
@@ -35,4 +35,6 @@
     private String status;
     @TableField(exist = false)
     private   List<SampleProjectResponse> projects;
+    @TableField("config_project")
+    private String configProject;
 }