Merge remote-tracking branch 'origin/master'

src/main/resources/mybatis/business/BizDayworkItemMapper.xml

@@ -129,6 +129,7 @@
       <if test="startTime == null">,start_time = '0000-00-00 00:00:00.00000'</if>
       <if test="startTime != null">,start_time = #{startTime}</if>
       <if test="equipmentDetailId != null">,equipment_detail_id = #{equipmentDetailId}</if>
+      <if test="rejectNum != null">,reject_num = #{rejectNum}</if>
       <if test="equipmentDetailId == null ">,equipment_detail_id = 0 </if>
       <if test="equipmentDetailCode != null">,equipment_detail_code = #{equipmentDetailCode}</if>
       <if test="equipmentDetailCode == null ">,equipment_detail_code = '' </if>