diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBillingTemplate.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBillingTemplate.java index 814e295f3..3b038dc9f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBillingTemplate.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBillingTemplate.java @@ -41,6 +41,11 @@ public class PileBillingTemplate extends BaseEntity { */ private String status; + /** + * 计费模板备注 + */ + private String templateRemark; + /** * 计费模板描述 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberGroupStationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberGroupStationVO.java index f8be68a49..6ce658ba3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberGroupStationVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberGroupStationVO.java @@ -16,7 +16,7 @@ public class MemberGroupStationVO { private String templateCode; // 优惠计费模板备注 - private String remark; + private String templateRemark; // 优惠计费模板描述 private String templateDesc; diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml index 040f8b265..2e925be3c 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml @@ -233,6 +233,7 @@ t1.id as stationId, t1.station_name as stationName, t2.template_code as templateCode, + t2.template_remark as templateRemark, t2.template_desc as templateDesc FROM pile_station_info t1 diff --git a/jsowell-ui/src/views/member/memberGroup/detail.vue b/jsowell-ui/src/views/member/memberGroup/detail.vue index cc7e5b5dc..adbbac352 100644 --- a/jsowell-ui/src/views/member/memberGroup/detail.vue +++ b/jsowell-ui/src/views/member/memberGroup/detail.vue @@ -80,7 +80,8 @@ - + +