Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-14 af3b68eeca07a30967754dc1a61b8def9efe188c

 ard-work/src/main/resources/mapper/plan/ArdEplanMapper.xml

@@ -31,6 +31,7 @@
            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
        </where>
        order by time desc
    </select>
    
    <select id="selectArdEplanById" parameterType="String" resultMap="ArdEplanResult">