Merge remote-tracking branch 'origin/master'

zss

2024-04-17 ba373426952033ca5885a35cac484dd4c857e8cf

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

@@ -118,7 +118,6 @@
            id=#{id}
        </where>
    </update>

    <select id="selectDeviceImage" resultType="com.yuanchu.mom.pojo.Device">
        select (image_upload, create_user, create_time) values (#{image_upload}
             , #{createUser}