Merge branch 'feature-wcz' of lift-manager/lift-server into develop

lift-business-service/src/main/resources/logback-spring.xml

@@ -6,7 +6,7 @@
 
     <property name="PROJECT" value="lift-business" />
     <property name="ROOT" value="logs/${PROJECT}/" />
-    <property name="FILESIZE" value="50MB" />
+    <property name="FILESIZE" value="10MB" />
     <property name="MAXHISTORY" value="100" />
     <timestamp key="DATETIME" datePattern="yyyy-MM-dd HH:mm:ss" />
     <!-- 控制台打印 -->

lift-business-service/src/main/resources/mapper/emergency/EmergencyRepairMapper.xml

@@ -67,7 +67,7 @@
     </select>
 
     <!--根据条件查询急修记录总条数-->
-    <select id="countByCondition" resultMap="BaseResultMap" parameterType="cn.com.ty.lift.business.emergency.dto.RepairRequest" >
+    <select id="countByCondition" resultType="java.lang.Long" parameterType="cn.com.ty.lift.business.emergency.dto.RepairRequest" >
         SELECT
         count(*)
         FROM

lift-enterprise-service/src/main/resources/logback-spring.xml

@@ -6,7 +6,7 @@
 
     <property name="PROJECT" value="lift-enterprise" />
     <property name="ROOT" value="logs/${PROJECT}/" />
-    <property name="FILESIZE" value="50MB" />
+    <property name="FILESIZE" value="10MB" />
     <property name="MAXHISTORY" value="100" />
     <timestamp key="DATETIME" datePattern="yyyy-MM-dd HH:mm:ss" />
     <!-- 控制台打印 -->