From 4e9f584062cacbf2cd008ef34ff10641c5962756 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 1 Sep 2024 14:43:28 +0800 Subject: [PATCH] fix --- .../java/com/iformall/controller/WxMallAdminController.java | 2 ++ .../src/main/java/com/iformall/domain/po/WxEnergyFeesTime.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java index f57e3f49a..9637be4a6 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java @@ -434,6 +434,8 @@ public class WxMallAdminController extends BaseController { @ApiOperation("费用区间自动时间") @PostMapping("periodAutoTimes") public ResultData periodAutoTimes(@ModelAttribute WxEnergyFeesTime record) { + // + 1111 List dateList = wxEnergyService.findLastTimeEndGroup(record); if (null != dateList && dateList.size() > 1 ) { return new ResultData(Result.ERROR,"所选店铺表类型最近一次结束时间不相同,不能一起增加"); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTime.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTime.java index 83c51d272..0ad68fcbf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTime.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFeesTime.java @@ -57,5 +57,7 @@ public class WxEnergyFeesTime extends TenantEntity { private List shopIds; @TableField(exist = false) private String shopName; + @TableField(exist = false) + private List meterIds; }