Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/domain/PileBillingTemplate.java

@@ -53,6 +53,16 @@ public class PileBillingTemplate extends BaseEntity {
 	@Excel(name = "充电站id")
 	private Long stationId;
 
+	/**
+	 * 免费占桩时长 （单位：分钟）
+	 */
+	private String freeTime;
+
+	/**
+	 * 占用费率 （单位：元/分钟）
+	 */
+	private String occupyFee;
+
 	/**
 	 * 删除标识（0-正常；1-删除）
 	 */

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

@@ -11,6 +11,8 @@
         <result property="remark" column="remark"/>
         <result property="type" column="type"/>
         <result property="stationId" column="station_id"/>
+        <result property="freeTime" column="free_time"/>
+        <result property="occupyFee" column="occupy_fee"/>
         <result property="publicFlag" column="public_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -21,7 +23,7 @@
 
     <sql id="Base_Column_List">
         <!--@mbg.generated PileBillingTemplate-->
-        id, template_code, name, status, remark, type, station_id, public_flag,
+        id, template_code, name, status, remark, type, station_id, free_time, occupy_fee, public_flag,
         create_time, update_by, update_time, del_flag
     </sql>
 
@@ -132,6 +134,12 @@
             <if test="stationId != null">
                 station_id,
             </if>
+            <if test="freeTime != null">
+                free_time,
+            </if>
+            <if test="occupyFee != null">
+                occupy_fee,
+            </if>
             <if test="createBy != null">
                 create_by,
             </if>
@@ -170,6 +178,12 @@
             <if test="stationId != null">
                 #{stationId},
             </if>
+            <if test="freeTime != null">
+                #{freeTime},
+            </if>
+            <if test="occupyFee != null">
+                #{occupyFee},
+            </if>
             <if test="createBy != null">
                 #{createBy},
             </if>
@@ -212,6 +226,12 @@
             <if test="stationId != null">
                 station_id = #{stationId},
             </if>
+            <if test="freeTime != null">
+                free_time = #{freeTime},
+            </if>
+            <if test="occupyFee != null">
+                occupy_fee = #{occupyFee},
+            </if>
             <if test="publishTime != null">
                 publish_time = #{publishTime},
             </if>