Merge branch 'cjl' into dev

cjl

2025-01-06 27e6bc3df3e39e0d0b147b155a89ad6837ea972b

 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;

}