Merge branch 'dev' of http://192.168.168.245:8888/youxiw20000/trash into dev

guzijian
2 parents 626e1713 22628e3e
Showing 2 changed files with 14 additions and 6 deletions
trash-admin/src/main/resources/application-dev.yml
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
@@ -9,7 +9,6 @@ trash:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
-#    profile: D:/trash/uploadPath
 #    profile: E:/trash/uploadPath
     profile: F:/work/project/Documents/uploadPath/trash
 #     获取ip地址开关
@@ -64,15 +63,15 @@ spring:
             testOnBorrow: false
             testOnReturn: false
             webStatFilter: 
-                enabled: true
+                enabled: false
             statViewServlet:
-                enabled: true
+                enabled: false
                 # 设置白名单，不填则允许所有访问
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: 
-                login-password: 
+                login-username: youxiw2000
+                login-password: Noah5201
             filter:
                 stat:
                     enabled: true
@@ -292,7 +292,16 @@ public class OrderDetailVo {
 	public void setHandleFlag(Boolean handleFlag) {
 		this.handleFlag = handleFlag;
 	}
-    
+
+	public Boolean getGarHandleEvaluateFlag() {
+		return garHandleEvaluateFlag;
+	}
+
+	public void setGarHandleEvaluateFlag(Boolean garHandleEvaluateFlag) {
+		this.garHandleEvaluateFlag = garHandleEvaluateFlag;
+	}
+
+	
 }