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

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBillingTemplateService.java

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BillingTemplateVO.java

@@ -31,6 +31,9 @@ public class BillingTemplateVO {
 	// 计费模板名称
 	private String templateName;
 
+	// 计费模板状态
+	private String status;
+
 	// 计费模板备注
 	private String remark;