Commit 31bb716d by huangZW

111

parent 6b66bb79
......@@ -17,7 +17,7 @@ public class YwWxEnterpriseDTO implements Serializable {
private Integer statusFlag;
//gic通讯录助手
private String gicContactHelper;
private String contactFlag;
//订购状态
private String buyStatus;
//订购时间
......@@ -75,12 +75,13 @@ public class YwWxEnterpriseDTO implements Serializable {
this.statusFlag = statusFlag;
}
public String getGicContactHelper() {
return gicContactHelper;
public String getContactFlag() {
return contactFlag;
}
public void setGicContactHelper(String gicContactHelper) {
this.gicContactHelper = gicContactHelper;
public void setContactFlag(String contactFlag) {
this.contactFlag = contactFlag;
}
public String getBuyStatus() {
......
......@@ -31,8 +31,8 @@ public class EnterpriseController extends WebBaseController{
private WxEnterpriseApiService wxEnterpriseApiService;
//企业列表
@RequestMapping("wx-enterprise-list")
public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo,String keyword,String gicContactHelper,String version) {
Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo,keyword,gicContactHelper,version);
public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo,String keyword,String contactFlag,String version) {
Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo,keyword,contactFlag,version);
PageResult<YwWxEnterpriseDTO> pageVo = new PageResult<>();
pageVo.setList(EntityUtil.changeEntityListByJSON(YwWxEnterpriseDTO.class, page.getResult()));
pageVo.setPageNum(page.getCurrentPage());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment