feature 代码提交

zhsw-entity/src/main/java/com/rongwe/zhsw/system/domain/SwInspectionTaskDo.java

@@ -1,13 +1,14 @@
 package com.rongwe.zhsw.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import lombok.Data;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Date;
+
+import static org.apache.ibatis.type.JdbcType.TIMESTAMP;
 
 /**
  * 巡检任务
@@ -64,10 +65,12 @@ public class SwInspectionTaskDo extends BaseDo {
     /**
      * 计划开始时间
      */
+    @TableField(value = "PLANNEDTIMESTART", jdbcType = TIMESTAMP)
     private LocalDateTime plannedtimestart;
     /**
      * 计划结束时间
      */
+    @TableField(value = "PLANNEDTIMESTART", jdbcType = TIMESTAMP)
     private LocalDateTime plannedtimeend;
     /**
      * 巡检状态(待巡检、已巡检、关闭)

zhsw-server/pom.xml

@@ -72,22 +72,20 @@
 
         <!-- druid -->
         <dependency>
-            <groupId>com.github.drtrang</groupId>
-            <artifactId>druid-spring-boot2-starter</artifactId>
-            <version>1.1.10</version>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.21</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.5</version>
         </dependency>
 
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>4.5.5</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-mail</artifactId>
-            </dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
 
 
     </dependencies>

zhsw-server/src/main/resources/bootstrap-dev.yml

@@ -4,11 +4,11 @@ spring:
       config:
         file-extension: yaml
         server-addr: 127.0.0.1:8848
-        namespace: cd047569-9470-4dfb-8663-b113d01cd30f
+        namespace: 9caed6dc-3784-4d73-bd4c-a8e8153bc358
         ext-config[0]:
           data-id: common-config.yaml
       discovery:
         server-addr: 127.0.0.1:8848
-        namespace: cd047569-9470-4dfb-8663-b113d01cd30f
+        namespace: 9caed6dc-3784-4d73-bd4c-a8e8153bc358
         #cd047569-9470-4dfb-8663-b113d01cd30f
         #9caed6dc-3784-4d73-bd4c-a8e8153bc358