From 32904182792822f7481a1a9cc959b7b547152734 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 5 Aug 2024 13:01:08 +0800 Subject: [PATCH] fix --- .../iformall/controller/market/WxFinanceController.java | 7 +++++++ .../src/main/java/com/iformall/domain/po/WxMerchant.java | 3 +++ 2 files changed, 10 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index 930aac930..88b4c50ea 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -354,4 +354,11 @@ public class WxFinanceController extends BaseController { return new ResultData(wxFinanceService.getTemplateById(record.getId())); } + @ApiOperation("打印项项目需要获取的租户号") + @GetMapping("templateCurrentTenant") + @TenantIgnore + public ResultData templateCurrentTenant() { + return new ResultData(this.getTenantInfo().getTenantId()); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 8e11896ad..4e348e912 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -480,4 +480,7 @@ public class WxMerchant extends TenantEntity { @TableField(exist = false) public Long energyFeesId; + @TableField(exist = false) + public Integer billType; + }