Commit 0d17c7b3 by guojuxing

tab_store&tab_store_field_rel&tab_store_region_rel&tab_store_brand_ref own_type改成owner_flag

parent 2bc266b5
......@@ -429,7 +429,7 @@ public class IndexModuleController {
ChannelUserRateVO vo = new ChannelUserRateVO();
vo.setAreaId(Long.parseLong(e.getMbrAreaId()));
vo.setAreaName(e.getMbrAreaName());
vo.setOwnType(e.getOwnType());
vo.setOwnerFlag(e.getOwnerFlag());
vo.setCuType(finalCuType);
vo.setMemberCount(finalMap.getOrDefault(Long.parseLong(e.getMbrAreaId()), 0));
return vo;
......@@ -521,7 +521,7 @@ public class IndexModuleController {
ResouceVO vo = new ResouceVO();
vo.setId(Long.valueOf(dto.getMbrAreaId()));
vo.setName(dto.getMbrAreaName());
vo.setOwnType(dto.getOwnType());
vo.setOwnerFlag(dto.getOwnerFlag());
result.add(vo);
}
}
......@@ -616,7 +616,7 @@ public class IndexModuleController {
MemberCardInfoVO vo = new MemberCardInfoVO();
vo.setMbrAreaId(dto.getAreaId().toString());
vo.setMbrAreaName(dto.getName());
vo.setOwnType(dto.getOwnerFlag());
vo.setOwnerFlag(dto.getOwnerFlag());
return vo;
}).collect(Collectors.toList());
}
......
......@@ -11,7 +11,10 @@ import java.io.Serializable;
public class ResouceVO implements Serializable {
private Long id;
private String name;
private Integer ownType;
/**
* 共享标记 1:自有 0:共享
*/
private Integer ownerFlag;
public Long getId() {
return id;
......@@ -29,12 +32,12 @@ public class ResouceVO implements Serializable {
this.name = name;
}
public Integer getOwnType() {
return ownType;
public Integer getOwnerFlag() {
return ownerFlag;
}
public ResouceVO setOwnType(Integer ownType) {
this.ownType = ownType;
public ResouceVO setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
......@@ -43,7 +46,7 @@ public class ResouceVO implements Serializable {
return "ResouceVO{" +
"id=" + id +
", name='" + name + '\'' +
", ownType=" + ownType +
", ownerFlag=" + ownerFlag +
'}';
}
}
......@@ -44,9 +44,9 @@ public class ChannelUserRateVO implements Serializable{
private String areaName;
/**
* 共享标
* 共享标记 1:自有 0:共享
*/
private Integer ownType;
private Integer ownerFlag;
public Integer getMemberCount() {
return memberCount;
......@@ -84,12 +84,12 @@ public class ChannelUserRateVO implements Serializable{
return this;
}
public Integer getOwnType() {
return ownType;
public Integer getOwnerFlag() {
return ownerFlag;
}
public ChannelUserRateVO setOwnType(Integer ownType) {
this.ownType = ownType;
public ChannelUserRateVO setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
......@@ -141,7 +141,7 @@ public class ChannelUserRateVO implements Serializable{
", cuType=" + cuType +
", areaId=" + areaId +
", areaName='" + areaName + '\'' +
", ownType=" + ownType +
", ownerFlag=" + ownerFlag +
'}';
}
}
......@@ -13,7 +13,10 @@ public class MemberCardInfoVO implements Serializable{
private String mbrAreaId;
private String mbrAreaName;
private Integer ownType;
/**
* 共享标记 1:自有 0:共享
*/
private Integer ownerFlag;
public String getMbrAreaId() {
return mbrAreaId;
......@@ -33,12 +36,12 @@ public class MemberCardInfoVO implements Serializable{
return this;
}
public Integer getOwnType() {
return ownType;
public Integer getOwnerFlag() {
return ownerFlag;
}
public MemberCardInfoVO setOwnType(Integer ownType) {
this.ownType = ownType;
public MemberCardInfoVO setOwnerFlag(Integer ownerFlag) {
this.ownerFlag = ownerFlag;
return this;
}
......@@ -47,7 +50,7 @@ public class MemberCardInfoVO implements Serializable{
return "MemberCardInfoVO{" +
"mbrAreaId='" + mbrAreaId + '\'' +
", mbrAreaName='" + mbrAreaName + '\'' +
", ownType=" + ownType +
", ownerFlag=" + ownerFlag +
'}';
}
}
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