diff --git a/pom.xml b/pom.xml
index 3c54220..43517b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,12 @@
uf
0.0.63
+
+ org.jetbrains
+ annotations
+ RELEASE
+ compile
+
diff --git a/src/main/java/a8k/a8k_can_protocol/RegIndex.java b/src/main/java/a8k/a8k_can_protocol/RegIndex.java
index 43ca8f9..39a815f 100644
--- a/src/main/java/a8k/a8k_can_protocol/RegIndex.java
+++ b/src/main/java/a8k/a8k_can_protocol/RegIndex.java
@@ -180,4 +180,5 @@ public enum RegIndex {
}
+
}
diff --git a/src/main/java/a8k/appbean/A8kTubeType.java b/src/main/java/a8k/appbean/A8kTubeType.java
index cbf67f7..13de77f 100644
--- a/src/main/java/a8k/appbean/A8kTubeType.java
+++ b/src/main/java/a8k/appbean/A8kTubeType.java
@@ -17,6 +17,4 @@ public enum A8kTubeType {
this.scanCode = scanCode;
this.name = name;
}
-
-
}
diff --git a/src/main/java/a8k/service/appdb/entity/AppSettingIterm.java b/src/main/java/a8k/service/appdb/entity/AppSettingIterm.java
new file mode 100644
index 0000000..3c5a0ae
--- /dev/null
+++ b/src/main/java/a8k/service/appdb/entity/AppSettingIterm.java
@@ -0,0 +1,4 @@
+package a8k.service.appdb.entity;
+
+public class AppSettingIterm {
+}
diff --git a/src/main/java/a8k/service/db/dao/SamplesPreProcessModuleCtrlParamsService.java b/src/main/java/a8k/service/db/dao/SamplesPreProcessModuleCtrlParamsService.java
index e444752..ce8ab1f 100644
--- a/src/main/java/a8k/service/db/dao/SamplesPreProcessModuleCtrlParamsService.java
+++ b/src/main/java/a8k/service/db/dao/SamplesPreProcessModuleCtrlParamsService.java
@@ -28,30 +28,32 @@ public class SamplesPreProcessModuleCtrlParamsService {
*/
// 高全血试管取帽位置
- public int getHighBlood_TakeCapPos() {
+ public int getZMotor_HighBloodTakeCapHeight() {
return 0;
}
// 矮全血试管取帽位置
- public int getShortBlood_TakeCapPos() {
+ public int getZMotor_ShortBloodTakeCapHeight() {
return 0;
}
// 高试管帽子判断位置
- public int getHighBlood_capJudgePos() {
+ public int getZMotor_HighBloodCapJudgeHeight() {
return 0;
}
// 矮全血试管帽子判断位置
- public int getShortBlood_capJudgePos() {
+ public int getZMotor_ShortBloodCapJudgeHeight() {
return 0;
}
- // 升降电机位置偏移
- public int getElevating_MotorPosOffset() {
+ // 摇匀位放置高度
+ public int getZMotor_placeShakeHeight() {
return 0;
}
+
+
/*
* 平移电机相关参数
*/