diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 4b30a27..5061612 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -370,10 +370,10 @@
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+                and dwl.LOGTIME &gt;<include refid="begintime_sql"/>
             </if>
             <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
+                and dwl.LOGTIME &lt;
                 <include refid="endtime_sql"/>
             </if>
             <if test="keywords != null and keywords !=''">
@@ -384,7 +384,7 @@
                 )
             </if>
         </where>
-        ORDER BY dwl.UPTIME DESC
+        ORDER BY dwl.LOGTIME DESC
     </select>
 
     <select id="selectMeterDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 4b30a27..5061612 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -370,10 +370,10 @@
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+                and dwl.LOGTIME &gt;<include refid="begintime_sql"/>
             </if>
             <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
+                and dwl.LOGTIME &lt;
                 <include refid="endtime_sql"/>
             </if>
             <if test="keywords != null and keywords !=''">
@@ -384,7 +384,7 @@
                 )
             </if>
         </where>
-        ORDER BY dwl.UPTIME DESC
+        ORDER BY dwl.LOGTIME DESC
     </select>
 
     <select id="selectMeterDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 0189e02..a64d1e5 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -154,8 +154,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
-
         <!--spring boot依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -221,7 +219,7 @@
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
         </dependency>
-        <!--   需要分布式session的话需要放开注释
+        <!--需要分布式session的话需要放开注释
             <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session</artifactId>

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 4b30a27..5061612 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -370,10 +370,10 @@
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+                and dwl.LOGTIME &gt;<include refid="begintime_sql"/>
             </if>
             <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
+                and dwl.LOGTIME &lt;
                 <include refid="endtime_sql"/>
             </if>
             <if test="keywords != null and keywords !=''">
@@ -384,7 +384,7 @@
                 )
             </if>
         </where>
-        ORDER BY dwl.UPTIME DESC
+        ORDER BY dwl.LOGTIME DESC
     </select>
 
     <select id="selectMeterDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 0189e02..a64d1e5 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -154,8 +154,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
-
         <!--spring boot依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -221,7 +219,7 @@
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
         </dependency>
-        <!--   需要分布式session的话需要放开注释
+        <!--需要分布式session的话需要放开注释
             <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session</artifactId>
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index bc4b4dc..c61f36e 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -57,7 +57,6 @@
             e.printStackTrace();
         }
 
-
         UsernamePasswordToken token = new UsernamePasswordToken(username, password.toCharArray());
         token.setRememberMe(false);
         try {
@@ -70,7 +69,6 @@
         super.getSession().setAttribute("username", shiroUser.getAccount());
 
         super.getSession().setAttribute(PermissionContant.SESSION_KEY, shiroUser.getId());
-
         LogManager.me().executeLog(LogTaskFactory.loginLog(shiroUser.getId(), getIp()));
 
         ShiroKit.getSession().setAttribute("sessionFlag", true);

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 4b30a27..5061612 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -370,10 +370,10 @@
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+                and dwl.LOGTIME &gt;<include refid="begintime_sql"/>
             </if>
             <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
+                and dwl.LOGTIME &lt;
                 <include refid="endtime_sql"/>
             </if>
             <if test="keywords != null and keywords !=''">
@@ -384,7 +384,7 @@
                 )
             </if>
         </where>
-        ORDER BY dwl.UPTIME DESC
+        ORDER BY dwl.LOGTIME DESC
     </select>
 
     <select id="selectMeterDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 0189e02..a64d1e5 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -154,8 +154,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
-
         <!--spring boot依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -221,7 +219,7 @@
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
         </dependency>
-        <!--   需要分布式session的话需要放开注释
+        <!--需要分布式session的话需要放开注释
             <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session</artifactId>
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index bc4b4dc..c61f36e 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -57,7 +57,6 @@
             e.printStackTrace();
         }
 
-
         UsernamePasswordToken token = new UsernamePasswordToken(username, password.toCharArray());
         token.setRememberMe(false);
         try {
@@ -70,7 +69,6 @@
         super.getSession().setAttribute("username", shiroUser.getAccount());
 
         super.getSession().setAttribute(PermissionContant.SESSION_KEY, shiroUser.getId());
-
         LogManager.me().executeLog(LogTaskFactory.loginLog(shiroUser.getId(), getIp()));
 
         ShiroKit.getSession().setAttribute("sessionFlag", true);
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index ed260a3..2f19dc6 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -39,6 +39,7 @@
 casic:
   swagger-open: false #是否开启swagger (true/false)
   kaptcha-open: true #是否开启登录时验证码 (true/false)
+  markChPwdDate: true #是否记录密码变更时间
   file-upload-path: d:/tmp  #文件上传目录(不配置的话为java.io.tmpdir目录)
   muti-datasource-open: false #是否开启多数据源(true/false)
   spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)