Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

 screen-manage/src/main/resources/mapper/SensorMapper.xml

@@ -85,10 +85,20 @@
                code = #{code},
            </if>
            <if test="upper != null">
                upper = #{upper},
                <if test="upper == ''">
                    upper = null,
                </if>
                <if test="upper != ''">
                    upper = #{upper},
                </if>
            </if>
            <if test="lower != null">
                lower = #{lower},
                <if test="lower == ''">
                    lower = null,
                </if>
                <if test="lower != ''">
                    lower = #{lower},
                </if>
            </if>
            <if test="default_unit_key != null">
                default_unit_key = #{default_unit_key},