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

yun-zuoyi
simon.song 4 years ago
commit 64d9eef5fc

@ -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;

Loading…
Cancel
Save