update

pom.xml

@@ -22,6 +22,12 @@
             <artifactId>uf</artifactId>
             <version>0.0.63</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/a8k/a8k_can_protocol/RegIndex.java

@@ -180,4 +180,5 @@ public enum RegIndex {
 	}
 
 
+
 }

src/main/java/a8k/appbean/A8kTubeType.java

@@ -17,6 +17,4 @@ public enum A8kTubeType {
 		this.scanCode = scanCode;
 		this.name     = name;
 	}
-
-
 }

src/main/java/a8k/service/appdb/entity/AppSettingIterm.java

@@ -0,0 +1,4 @@
+package a8k.service.appdb.entity;
+
+public class AppSettingIterm {
+}

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;
 	}
 
+
+
 	/*
 	 * 平移电机相关参数
 	 */