fix

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());
+    }
+    
 }

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;
+	
 }