diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java index eb41f876..a8acec1a 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java @@ -160,9 +160,9 @@ public class XhpcChargingPileController extends BaseController { } R r = powerPileService.configTimeNRateModel(serialNumber); if(r.getCode() !=200){ - return AjaxResult.error("下发校时校价失败,请重新下发"); + return AjaxResult.error(r.getMsg()); } - return AjaxResult.success("下发校时校价成功"); + return AjaxResult.success(r.getMsg()); } @GetMapping("/configRmReplyMessage") diff --git a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml index 6b2de728..d3d69341 100644 --- a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml +++ b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml @@ -100,7 +100,7 @@ status, create_time as createTime from xhpc_sms - where del_flag=0 + where del_flag=0 and content is not null and status=#{status}