diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml index 837fae4c0..e6c73352f 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml @@ -15,6 +15,7 @@ + @@ -25,7 +26,7 @@ id, template_code, name, status, remark, type, station_id, free_time, occupy_fee, max_occupy_fee, public_flag, - create_time, update_by, update_time, del_flag + member_flag, create_time, update_by, update_time, del_flag @@ -123,6 +124,9 @@ public_flag, + + member_flag, + name, @@ -170,6 +174,9 @@ #{publicFlag}, + + #{memberFlag}, + #{name}, @@ -330,6 +337,7 @@ t2.free_time as freeTime, t2.occupy_fee as occupyFee, t2.publish_time as publishTime, + t2.member_flag as memberFlag, t3.electricity_price AS sharpElectricityPrice, t3.service_price AS sharpServicePrice, t3.apply_time AS sharpApplyDate, diff --git a/jsowell-ui/src/views/pile/station/components/billing.vue b/jsowell-ui/src/views/pile/station/components/billing.vue index 97e2f2589..73728732e 100644 --- a/jsowell-ui/src/views/pile/station/components/billing.vue +++ b/jsowell-ui/src/views/pile/station/components/billing.vue @@ -125,35 +125,11 @@