Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

.gitignore

@@ -60,4 +60,5 @@ yarn-error.log*
 package-lock.json
 */node_modules/
 */dist/
-*.log
+*.log
+/log.path_IS_UNDEFINED/2019-11/debug.2019-11-29.0.log.gz

lift-batch-service/src/main/resources/mapper/EmergencyRepairData.xml

@@ -23,7 +23,7 @@
         where
             er.caller_date <![CDATA[ >= ]]> #{startTimeStr}
         and
-            er.caller_date <![CDATA[ >= ]]> #{endTimeStr}
+            er.caller_date <![CDATA[ <= ]]> #{endTimeStr}
     </select>
 
 </mapper>