Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-admin/src/test/java/SpringBootTestController.java

@@ -2846,7 +2846,7 @@ public class SpringBootTestController {
             if (StringUtils.equals(orderListVO.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) {
                 // 修改数据库订单状态
                 OrderBasicInfo info = OrderBasicInfo.builder()
-                        .id(Long.parseLong(orderListVO.getId()))
+                        .id(Integer.parseInt(orderListVO.getId()))
                         .orderStatus(OrderStatusEnum.ABNORMAL.getValue())
                         .build();
                 orderBasicInfoService.updateOrderBasicInfo(info);