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

lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml

@@ -84,7 +84,7 @@
         LEFT JOIN project_lift_relevance plr ON pclr.mt_company_id = plr.mt_company_id AND pclr.lift_id = plr.lift_id
         LEFT JOIN project p ON pclr.mt_company_id = p.mt_company_id AND plr.project_id = p.id
         LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
-        WHERE 1 = 1;
+        WHERE 1 = 1
         <if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
             AND pclr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
         </if>