Merge branch 'dev-chw-vehicle' into dev-chw

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

@@ -74,7 +74,7 @@ public class OrderViolationController extends BaseController<OrderViolationBiz,
 	 * @return
 	 */
 	@GetMapping("/getOne/{detailId}")
-	public ObjectRestResponse<OrderViolation> getOne(@PathVariable Integer detailId) {
+	public ObjectRestResponse<List<OrderViolation>> getOne(@PathVariable Integer detailId) {
 		Example exa = Example.builder(OrderViolation.class)
 				.where(WeekendSqls.<OrderViolation>custom().andEqualTo(OrderViolation::getDetailId, detailId)
 						.andEqualTo(OrderViolation::getIsDel, 0)).build();
@@ -82,9 +82,7 @@ public class OrderViolationController extends BaseController<OrderViolationBiz,
 		if (orderViolations.size() > 1) {
 			throw new BaseException("The database has multiple records");
 		}
-		OrderViolation orderViolation = new OrderViolation();
-		orderViolation = (orderViolations.size() == 0) ? null : orderViolations.get(0);
-		return ObjectRestResponse.succ(orderViolation);
+		return ObjectRestResponse.succ(orderViolations);
 	}