Merge branch 'master' of http://47.92.195.73:8081/project_boditech_vidas_a8000_v3/a8k_app

1 year ago · 045057bf08
7 changed files with 12 additions and 1 deletions
--- a/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java
+++ b/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java
@ -1,5 +1,6 @@
 package a8k.service.hardware;

+import a8k.appbean.A8kScanCurve;
 import a8k.canbus.protocol.A8kEcode;
 import a8k.canbus.protocol.MId;
 import a8k.appbean.A8kTubeType;
@ -13,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.List;

@Component
--- a/src/main/resources/static/test/css/app.e804b054.css
+++ b/src/main/resources/static/test/css/app.e804b054.css
--- a/src/main/resources/static/test/index.html
+++ b/src/main/resources/static/test/index.html
@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>a8k_webui</title><script defer="defer" src="js/chunk-vendors.0bbc0a44.js"></script><script defer="defer" src="js/app.de139c1f.js"></script><link href="css/app.d5f9ba8f.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but a8k_webui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>a8k_webui</title><script defer="defer" src="js/chunk-vendors.0bbc0a44.js"></script><script defer="defer" src="js/app.a316097c.js"></script><link href="css/app.e804b054.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but a8k_webui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
--- a/src/main/resources/static/test/js/app.a316097c.js
+++ b/src/main/resources/static/test/js/app.a316097c.js
--- a/src/main/resources/static/test/js/app.a316097c.js.map
+++ b/src/main/resources/static/test/js/app.a316097c.js.map
--- a/src/main/resources/static/test/js/app.bc2e12ec.js
+++ b/src/main/resources/static/test/js/app.bc2e12ec.js
--- a/src/main/resources/static/test/js/app.bc2e12ec.js.map
+++ b/src/main/resources/static/test/js/app.bc2e12ec.js.map