From baf0a9f2101a5bfcd7b1199eff418e8f261e3d98 Mon Sep 17 00:00:00 2001 From: sige Date: Wed, 24 Apr 2024 19:45:30 +0800 Subject: [PATCH] ~ --- app.db | Bin 520192 -> 561152 bytes .../com/iflytop/digester/DigestionTaskThread.java | 2 +- .../underframework/dao/model/UfMdbOption.java | 3 +++ web | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app.db b/app.db index dbc823e51f202a1b6b3cf07c20ca18ecf78d9f41..55d8779861bdf403aee5789989e44f81b178fb8b 100644 GIT binary patch delta 32701 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 GkpBY+E^~VT 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