From 6f570591fb9155cf858981f432467ee9980762cd Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 24 八月 2022 15:36:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
index c464144..f658334 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
@@ -31,7 +31,7 @@
@PostMapping("/C3ChargingList")
public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO, @RequestBody(required = false) C3ChargingParam c3ChargingParam
, @RequestParam(value = "order", required = false) Integer order
- ,@RequestParam(value = "seq", required = false) Integer seq) {
+ , @RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.C3_CHARGING_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -62,6 +62,7 @@
/**
* 鍏呯數缁撴潫鈥斺�斿皬绋嬪簭鐢ㄦ埛缁撴潫锛屼笉闇�瑕乼oken锛岄渶瑕乷penId
*/
+ @AnonymousAccess
@PostMapping("/finishCharging")
public ResponseVO<Object> finishCharging(@RequestBody C3ChargingParam c3ChargingParam) {
if (c3ChargingParam.getC3Mac() == null || c3ChargingParam.getOpenId() == null) {
--
Gitblit v1.9.3