Merge remote-tracking branch 'origin/master'

zss

2024-08-08 bc7ee9878359b52c666c7c5f386a8e0c65d2056f

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

@@ -22,4 +22,7 @@
        <result column="create_time" property="createTime" />
    </resultMap>

    <select id="selectList1" resultMap="BaseResultMap">
        select * from device_pk_slave where shift_id=#{isid}
    </select>
</mapper>