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

jinpengyong

2023-09-26 fd68d9efbe525e9210f7013c1f103f197f01841c

 screen-manage/src/main/java/com/moral/api/entity/Sensor.java

@@ -85,9 +85,15 @@
    private String unitKey;

    @TableField(exist = false)
    private Integer maxValue;
    private String showUnit;

    @TableField(exist = false)
    private Integer minValue;
    private String showUnitKey;

    @TableField(exist = false)
    private String alarmLevel;

    @TableField(exist = false)
    private String formula;

}