Merge branch 'dev_order_info0725' into 'develop'

修改

See merge request !260

project-order/src/main/java/com/dituhui/pea/order/dao/OrderInfoMPDao.java

@@ -24,9 +24,9 @@ public interface OrderInfoMPDao extends BaseMapper<OrderInfo> {
 			"<foreach item='orderId' index='index' collection='orderIds' open='(' separator=',' close=')'>#{orderId}</foreach></script>")
 			"<foreach item='orderId' index='index' collection='orderIds' open='(' separator=',' close=')'>#{orderId}</foreach></script>")
 	List<OrderInfo> selectByDtAndOrderIds(@Param("dt") LocalDate dt, @Param("orderIds") List<String> orderIds);
 	List<OrderInfo> selectByDtAndOrderIds(@Param("dt") LocalDate dt, @Param("orderIds") List<String> orderIds);
 
 
-	@Select("select * from order_info where dt=#{dt} and engineerCode=#{engineerCode}")
+	@Select("select * from order_info where dt=#{dt} and engineer_code=#{engineerCode}")
 	List<OrderInfo> selectByEngineerCodeAndDt(String engineerCode, LocalDate dt);
 	List<OrderInfo> selectByEngineerCodeAndDt(String engineerCode, LocalDate dt);
 
 
-	@Select("select * from order_info where dt=#{dt} and engineerCode=#{engineerCode} and appointment_status=#{appointmentStatus}")
+	@Select("select * from order_info where dt=#{dt} and engineer_code=#{engineerCode} and appointment_status=#{appointmentStatus}")
 	List<OrderInfo> selectByEngineerCodeAndDtAndAppointmentStatus(String engineerCode, LocalDate dt, String appointmentStatus);
 	List<OrderInfo> selectByEngineerCodeAndDtAndAppointmentStatus(String engineerCode, LocalDate dt, String appointmentStatus);
 }
 }