2 Commits e844b65ad4 ... b968391bb2

Author SHA1 Message Date
  lin b968391bb2 Merge remote-tracking branch 'origin/20210716' into 20210716 3 years ago
  lin ef01a92773 device 3 years ago

+ 2 - 0
zoniot-rmcp/zoniot-rmcp-web/src/main/resources/application-sit.properties

@@ -108,6 +108,8 @@ ribbon.ConnectTimeout=3000
 xxl.job.admin.addresses=http://10.0.0.62:8080/xxl-job-admin/
 xxl.job.group.id=1
 
+spring.main.allow-bean-definition-overriding=true
+