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

@@ -36,6 +36,11 @@ public class PileBillingTemplate extends BaseEntity {
 	@Excel(name = "模板名称")
 	private String name;
 
+	/**
+	 * 模板状态(0-未启用；1-启用)
+	 */
+	private String status;
+
 	/**
 	 * 车辆类型（1-电动汽车；2-电动自行车）
 	 */

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

@@ -7,6 +7,7 @@
         <result property="id" column="id"/>
         <result property="templateCode" column="template_code"/>
         <result property="name" column="name"/>
+        <result property="status" column="status"/>
         <result property="remark" column="remark"/>
         <result property="type" column="type"/>
         <result property="stationId" column="station_id"/>
@@ -20,7 +21,7 @@
 
     <sql id="Base_Column_List">
         <!--@mbg.generated PileBillingTemplate-->
-        id, template_code, name, remark, type, station_id, public_flag,
+        id, template_code, name, status, remark, type, station_id, public_flag,
         create_time, update_by, update_time, del_flag
     </sql>
 
@@ -119,6 +120,9 @@
             <if test="name != null">
                 name,
             </if>
+            <if test="status != null">
+                status,
+            </if>
             <if test="remark != null">
                 remark,
             </if>
@@ -154,6 +158,9 @@
             <if test="name != null">
                 #{name},
             </if>
+            <if test="status!= null">
+                #{status},
+            </if>
             <if test="remark != null">
                 #{remark},
             </if>
@@ -193,6 +200,9 @@
             <if test="name != null">
                 name = #{name},
             </if>
+            <if test="status != null">
+                status = #{status},
+            </if>
             <if test="remark != null">
                 remark = #{remark},
             </if>