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

gongchunyi

2 天以前 f81364e8bfbede8de723c708eee8060cb2c63b83

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

@@ -38,6 +38,7 @@
        left join safe_training_details std on std.safe_training_id = st.id
        left join sys_user su on st.assessment_user_id = su.user_id
        where  st.state = #{c.state}
        GROUP BY st.id
        <if test="c.placeTraining != null and c.placeTraining != ''">
            and st.place_training like concat('%', #{c.placeTraining}, '%')
        </if>