Commit a283f636586d1ada4f20a53d08a9009b004b6742

Authored by youxiw2000
1 parent ea295712

m

trash-admin/src/main/resources/application-dev.yml
@@ -63,15 +63,15 @@ spring: @@ -63,15 +63,15 @@ spring:
63 testOnBorrow: false 63 testOnBorrow: false
64 testOnReturn: false 64 testOnReturn: false
65 webStatFilter: 65 webStatFilter:
66 - enabled: true 66 + enabled: false
67 statViewServlet: 67 statViewServlet:
68 - enabled: true 68 + enabled: false
69 # 设置白名单,不填则允许所有访问 69 # 设置白名单,不填则允许所有访问
70 allow: 70 allow:
71 url-pattern: /druid/* 71 url-pattern: /druid/*
72 # 控制台管理用户名和密码 72 # 控制台管理用户名和密码
73 - login-username:  
74 - login-password: 73 + login-username: youxiw2000
  74 + login-password: Noah5201
75 filter: 75 filter:
76 stat: 76 stat:
77 enabled: true 77 enabled: true
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
@@ -246,7 +246,16 @@ public class OrderDetailVo { @@ -246,7 +246,16 @@ public class OrderDetailVo {
246 public void setHandleFlag(Boolean handleFlag) { 246 public void setHandleFlag(Boolean handleFlag) {
247 this.handleFlag = handleFlag; 247 this.handleFlag = handleFlag;
248 } 248 }
249 - 249 +
  250 + public Boolean getGarHandleEvaluateFlag() {
  251 + return garHandleEvaluateFlag;
  252 + }
  253 +
  254 + public void setGarHandleEvaluateFlag(Boolean garHandleEvaluateFlag) {
  255 + this.garHandleEvaluateFlag = garHandleEvaluateFlag;
  256 + }
  257 +
  258 +
250 259
251 260
252 } 261 }