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

lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml

@@ -115,7 +115,7 @@
 		<if test="request.registrationCode!=null and request.registrationCode!=''">
 			AND l.registration_code LIKE #{request.registrationCode,jdbcType=VARCHAR}
 		</if>
-		ORDER BY plan_date
+		ORDER BY planDate
 	</select>
 
 	<select id="queryPlanListByIds" parameterType="java.util.Map" resultMap="BaseResultMap">