计费模板备注字段

jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateOrUpdateBillingTemplateDTO.java

@@ -79,7 +79,7 @@ public class CreateOrUpdateBillingTemplateDTO {
 	 * 备注
 	 */
 	@ApiModelProperty("备注")
-	private String remark;
+	private String templateRemark;
 
 	/**
 	 * 时段清单

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java

@@ -167,7 +167,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
         PileBillingTemplate billingTemplate = new PileBillingTemplate();
         billingTemplate.setName(dto.getName());
         billingTemplate.setType(String.valueOf(dto.getType()));
-        billingTemplate.setTemplateRemark(dto.getRemark());
+        billingTemplate.setTemplateRemark(dto.getTemplateRemark());
         billingTemplate.setTemplateCode(templateCode);
         billingTemplate.setCreateBy(SecurityUtils.getUsername());
         billingTemplate.setDelFlag(DelFlagEnum.NORMAL.getValue());
@@ -233,7 +233,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
         // 查询站点信息
         billingTemplate.setName(dto.getName());
         billingTemplate.setType(String.valueOf(dto.getType()));
-        billingTemplate.setTemplateRemark(dto.getRemark());
+        billingTemplate.setTemplateRemark(dto.getTemplateRemark());
         billingTemplate.setUpdateBy(SecurityUtils.getUsername());
         billingTemplate.setFreeTime(dto.getFreeTime());
         billingTemplate.setOccupyFee(dto.getOccupyFee());
@@ -308,7 +308,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
         EchoBillingTemplateVO result = new EchoBillingTemplateVO();
         result.setBillingTemplateId(String.valueOf(id));
         result.setName(pileBillingTemplate.getName());
-        result.setRemark(pileBillingTemplate.getRemark());
+        result.setTemplateRemark(pileBillingTemplate.getTemplateRemark());
         result.setType(pileBillingTemplate.getType());
         result.setFreeTime(pileBillingTemplate.getFreeTime());
         result.setOccupyFee(pileBillingTemplate.getOccupyFee());

jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml

@@ -8,7 +8,7 @@
         <result property="templateCode" column="template_code"/>
         <result property="name" column="name"/>
         <result property="status" column="status"/>
-        <result property="remark" column="remark"/>
+        <result property="templateRemark" column="template_remark"/>
         <result property="templateDesc" column="template_desc"/>
         <result property="type" column="type"/>
         <result property="stationId" column="station_id"/>
@@ -26,7 +26,7 @@
 
     <sql id="Base_Column_List">
         <!--@mbg.generated PileBillingTemplate-->
-        id, template_code, name, status, remark, template_desc, type, station_id, free_time, occupy_fee, max_occupy_fee, public_flag,
+        id, template_code, name, status, template_remark, template_desc, type, station_id, free_time, occupy_fee, max_occupy_fee, public_flag,
         member_flag, create_time, update_by, update_time, del_flag
     </sql>
 
@@ -91,7 +91,7 @@
                 a.free_time,
                 a.occupy_fee,
                 a.max_occupy_fee,
-               a.remark,
+               a.template_remark,
                a.type,
                a.station_id,
                a.create_by,

jsowell-ui/src/views/billing/template/components/addBilling.vue

@@ -12,9 +12,9 @@
           placeholder="请输入模板名称"
         />
       </el-form-item>
-      <el-form-item label="备注" prop="remark" label-width="150px">
+      <el-form-item label="备注" prop="templateRemark" label-width="150px">
         <el-input
-          v-model="form.remark"
+          v-model="form.templateRemark"
           style="width: 50%"
           placeholder="请输入模板备注"
         />
@@ -507,7 +507,7 @@ export default {
         ],
         type: "1",
         name: "",
-        remark: "",
+          templateRemark: "",
         minMoney: "",
         minute: "",
       },

jsowell-ui/src/views/billing/template/components/addOrUpdateBilling.vue

@@ -14,9 +14,9 @@
           placeholder="请输入模板名称"
         />
       </el-form-item>
-      <el-form-item label="备注" prop="remark">
+      <el-form-item label="备注" prop="templateRemark">
         <el-input
-          v-model="form.remark"
+          v-model="form.templateRemark"
           style="width: 50%"
           placeholder="请输入模板备注"
         />
@@ -328,7 +328,7 @@ export default {
         servicePriceC: "",
         electricityPriceD: "",
         servicePriceD: "",
-        remark: "", // 备注
+          templateRemark: "", // 备注
         timeList: [], // 汽车
       },
       // 新增时间段弹框

jsowell-ui/src/views/billing/template/components/chargeable .vue

@@ -10,8 +10,8 @@
       <el-form-item label="模板名称" prop="name">
         <el-input v-model="form.name" placeholder="请输入模板名称" />
       </el-form-item>
-      <el-form-item label="模板备注" prop="remark">
-        <el-input v-model="form.remark" placeholder="请输入模板备注" />
+      <el-form-item label="模板备注" prop="templateRemark">
+        <el-input v-model="form.templateRemark" placeholder="请输入模板备注" />
       </el-form-item>
       <el-form-item label="充电站" prop="stationId">
         <el-input v-model="form.stationId" placeholder="请输入充电站" />

jsowell-ui/src/views/billing/template/index.vue

@@ -81,7 +81,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <!--<el-table-column label="${comment}" align="center" prop="id" />-->
       <el-table-column label="模板名称" align="center" prop="name" />
-      <el-table-column label="模板备注" align="center" prop="remark" />
+      <el-table-column label="模板备注" align="center" prop="templateRemark" />
       <el-table-column label="车辆类型" align="center" prop="type">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.vehicle_type" :value="scope.row.type" />