diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java index cf2a6e801..4cff936fb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java @@ -17,6 +17,9 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +/** + * @author gongbiao + */ @RestController @RequestMapping("wxMerchant") public class WxMerchantController extends BaseController { @@ -77,8 +80,7 @@ public class WxMerchantController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - WxMerchant wxMerchant = new WxMerchant(); - wxMerchant = wxMerchantService.getById(id); + WxMerchant wxMerchant = wxMerchantService.getById(id); if (wxMerchant != null) { WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant); if (receiver != null){ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index a18dd0406..6d947434d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -36,8 +36,9 @@ public class WxBillProperty implements Serializable { public void setIds(List ids) { this.ids = ids; } - - + + @Transient + private String merchantName; /*租金合同ID**/ @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") @@ -184,7 +185,13 @@ public class WxBillProperty implements Serializable { updatetime = _updatetime; } + public String getMerchantName() { + return merchantName; + } + public void setMerchantName(String merchantName) { + this.merchantName = merchantName; + } public static enum Field { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java index 178b0eade..a7d3574ee 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java @@ -36,8 +36,9 @@ public class WxBillPropertyDeposit implements Serializable { public void setIds(List ids) { this.ids = ids; } - - + + @Transient + private String merchantName; /*租金合同ID**/ @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") @@ -184,7 +185,13 @@ public class WxBillPropertyDeposit implements Serializable { updatetime = _updatetime; } + public String getMerchantName() { + return merchantName; + } + public void setMerchantName(String merchantName) { + this.merchantName = merchantName; + } public static enum Field {