Merge branch 'master-modify-background-bug-hf' into dev

# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -192,8 +192,8 @@
         <if test="userId!=null">
             and l.id=#{userId}
         </if>
-        <if test=" realname !=null  realname != ''">
-            d.realname like  CONCAT('%',#{realname},'%')
+        <if test="realName !=null and  realName != ''">
+           and  d.realname like CONCAT('%',#{realName},'%')
         </if>
         <if test="citySet != null ">
             and d.city_code in

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -130,7 +130,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                         return false;
                     }
 
-                    if (e.getStatus() == 4) {
+                    if (e.getStatus() == 4||e.getStatus() == 5) {
                         value.setShowType(2);
                         return false;
                     }