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

project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/BatchServiceImpl.java

@@ -121,7 +121,7 @@ public class BatchServiceImpl implements BatchService {
                 "      left join order_appointment o on (a.order_id =o.order_id)\n" +
                 "                  where a.org_group_id=?  and a.status='OPEN' \n" +
                 "                  and a.dt = ?  " +
-                "                  and a.appointment_status = 'ASSIGNED'  and o.appointment_method like 'AUTO%'  \n" +
+                "                  and a.appointment_status = 'ASSIGNED'  and a.appointment_method like 'AUTO%'  \n" +
                 "                  and o.pre_status in ('PRE') \n" +
                 "    order by a.expect_time_begin asc  ";
         int orderCountPre = jdbcTemplate.update(sqlOrderPre, batchNo, groupId, batchDay);

project-dispatch/src/main/resources/logback.xml

@@ -3,7 +3,7 @@
 
   <appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] [%-20.20c] %-5p %m%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] [%-20.20c] %line %-5p %m%n </pattern>
     </encoder>
   </appender>