Merge branch 'dev_New_pro' into dev_天津_宝东pro

云

2026-05-15 3a941e0fc821d879d5f17b41dfc6d9c7688862dc

 src/main/resources/mapper/safe/SafeTrainingDetailsMapper.xml

@@ -30,7 +30,7 @@
                 left join safe_training st on std.safe_training_id = st.id
        where std.user_id = #{c.userId}
        <if test="c.trainingDate != null">
            and st.training_date = #{c.trainingDate}
            and st.training_date = date_format(#{c.trainingDate},'%Y%m%d')
        </if>
    </select>