Merge remote-tracking branch 'origin/test' into test

4 years ago · 64d9eef5fc
parent 05f805f227 ebd3f85255
commit 64d9eef5fc
1 changed files with 4 additions and 0 deletions
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java
@ -129,6 +129,10 @@ public class MesKpData extends BaseBean implements Serializable {
    @ApiParam("物料名称")
    private String partName;

+    @Transient
+    @ApiParam("数据范围")
+    private String torqueValRange;
+

    public double getKeyDataCountVal() {
        return this.keyDataCount == null ? 0 : this.keyDataCount;