新增计费模板描述字段

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;
+
 	/**
 	 * 计费模板描述
 	 */

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;

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

jsowell-ui/src/views/member/memberGroup/detail.vue

@@ -80,7 +80,8 @@
                         </el-col>
                         <el-table :data="sitesList" stripe style="width: 100%" v-loading="loading">
                             <el-table-column label="站点名称" align="center" prop="stationName" width="300" />
-                            <el-table-column label="描述" align="center" prop="remark" />
+                            <el-table-column label="备注" align="center" prop="templateRemark" />
+                            <el-table-column label="描述" align="center" prop="templateDesc" />
                             <el-table-column label="操作" align="center" width="200">
                                 <template slot-scope="scope">
                                     <el-button size="mini" type="text" icon="el-icon-edit"