Merge branch 'master-bacground-im' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java

@@ -73,7 +73,7 @@ public class PublicController {
                     , new HashSet<String>() {{add("用户名不存在！");}});
         }
         Integer userid = Integer.parseInt(username);
-        return ObjectRestResponse.succ(getAppUserInfoById(userid));
+        return getAppUserInfoById(userid);
     }
 
     @RequestMapping(value = "/app/userinfo-by-id", method = RequestMethod.GET)
@@ -82,7 +82,7 @@ public class PublicController {
         if (id == null) {
             return ObjectRestResponse.paramIsEmpty();
         }
-        return ObjectRestResponse.succ(getAppUserInfoById(id));
+        return getAppUserInfoById(id);
     }
 
     @RequestMapping(value = "/app/userinfo-by-username", method = RequestMethod.GET)
@@ -99,7 +99,7 @@ public class PublicController {
                         , new HashSet<String>() {{add("用户名不存在！");}});
             }
         }
-        return ObjectRestResponse.succ(getAppUserInfoById(appUserLogin.getId()));
+        return getAppUserInfoById(appUserLogin.getId());
     }
 
     private ObjectRestResponse<AppUserDTO> getAppUserInfoById(Integer userid) throws IllegalAccessException, InvocationTargetException {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -325,7 +325,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
         for (OrderPageVO orderPageVO : pageDataVO.getData()) {
             if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
                 ObjectRestResponse<Vehicle> restResponse = vehicleFeign.get(orderPageVO.getOrderRentVehicleDetail().getVehicleId());
-                log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
                 if (restResponse.getData() != null) {
                     orderPageVO.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
                     orderPageVO.setCode(restResponse.getData().getCode());