diff --git a/app.db b/app.db index dbc823e..55d8779 100644 Binary files a/app.db and b/app.db differ diff --git a/src/main/java/com/iflytop/digester/DigestionTaskThread.java b/src/main/java/com/iflytop/digester/DigestionTaskThread.java index 9521d24..109a61c 100644 --- a/src/main/java/com/iflytop/digester/DigestionTaskThread.java +++ b/src/main/java/com/iflytop/digester/DigestionTaskThread.java @@ -166,7 +166,7 @@ public class DigestionTaskThread extends Thread { var tubes = this.heatingSlot.getExistTubeIndexes(); var liquidAddition = device.liquidAddition; for ( var liquid : digestionRound.liquids ) { - this.updateTaskStatus("Liquid", String.format("加液 %s %d", liquid.type, liquid.volume)); + this.updateTaskStatus("Liquid", String.format("加液 %s %dml", liquid.type, liquid.volume)); liquidAddition.addLiquidToTubes(tubes, liquid.type, liquid.volume); this.updateTaskStatus("Liquid", "加液完成"); } diff --git a/src/main/java/com/iflytop/digester/underframework/dao/model/UfMdbOption.java b/src/main/java/com/iflytop/digester/underframework/dao/model/UfMdbOption.java index 18274f4..b0c04e8 100644 --- a/src/main/java/com/iflytop/digester/underframework/dao/model/UfMdbOption.java +++ b/src/main/java/com/iflytop/digester/underframework/dao/model/UfMdbOption.java @@ -18,6 +18,9 @@ public class UfMdbOption extends UfActiveRecord { @UfActiveRecordField public String dataType; + @UfActiveRecordField + public String unit; + // get table name public static String getTableName() { return "app_options"; diff --git a/web b/web index 9380bd9..ec3c79a 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 9380bd9e280da60f53a323d70b8cb3135b2d5130 +Subproject commit ec3c79a8bda6fa0fc4657ad1e4830487ba55f7a4