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

cjl

2023-09-28 8eb4ae5aee53a2529c759d95dd529d91dd25ba1d

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

@@ -84,4 +84,16 @@
    @TableField(exist = false)
    private String unitKey;

    @TableField(exist = false)
    private String showUnit;

    @TableField(exist = false)
    private String showUnitKey;

    @TableField(exist = false)
    private String alarmLevel;

    @TableField(exist = false)
    private String formula;

}