Merge remote-tracking branch 'origin/master'

Crunchy

2024-04-23 4f986140a10e71c07c7001ccbcda6e93e17736b1

 cnas-server/src/main/resources/mapper/DeviceMapper.xml

@@ -80,7 +80,6 @@
    </select>

    <update id="upDeviceParameter" parameterType="com.yuanchu.mom.pojo.Device">

        UPDATE device
        <set>
            <if test="largeCategory!=null and largeCategory!='' ">large_category=#{largeCategory},</if>