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

cjl

2023-10-10 495fad8166b5952c013aea275243cb9ee6e7fa2a

 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;

}