Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

8 天以前 bd1c98db3e0de80c06a53d3302781c2b0b50a3da

 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>