diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantReceiverApplyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantReceiverApplyVo.java index 3f6af3465..fae3bfec1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantReceiverApplyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantReceiverApplyVo.java @@ -16,11 +16,11 @@ public class WxMerchantReceiverApplyVo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") private String merchantName; - @io.swagger.annotations.ApiModelProperty(value="商户联系人",name="linkPhone") + @io.swagger.annotations.ApiModelProperty(value="商户联系人",name="merchantlinkPerson") private String merchantlinkPerson; - @io.swagger.annotations.ApiModelProperty(value="商户联系方式",name="linkPhone") + @io.swagger.annotations.ApiModelProperty(value="商户联系方式",name="merchantLinkPhone") private String merchantLinkPhone; - @io.swagger.annotations.ApiModelProperty(value="商户状态1可用0停用",name="status") + @io.swagger.annotations.ApiModelProperty(value="商户状态1可用0停用",name="merchantStatus") private Integer merchantStatus; private Long applyId; diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverApplyMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverApplyMapper.xml index 0d2d5e64a..87fcb441a 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverApplyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverApplyMapper.xml @@ -193,6 +193,8 @@ and m.`status` = #{merchantStatus} + and wpsra.`applyment_state` is not null + and wpsra.`tenant_id` = #{tenantId}