Merge branch 'cjl' into qa

cjl

2023-10-20 cbdb9ea8d17e07dda2362d1c61e867afe8395ef2

 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;

}