Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-20 bbd62792fcf95c2ef6c8c0696fd8601869eb1d49

 ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml

@@ -32,6 +32,7 @@
            <if test="description != null  and description != ''"> and description = #{description}</if>
            <if test="deleted != null  and deleted != ''"> and deleted = #{deleted}</if>
        </where>
        ORDER BY order_num ASC
    </select>

    <select id="selectYwThresholdById" parameterType="Long" resultMap="YwThresholdResult">