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/service/IPileBillingTemplateService.java

@@ -166,4 +166,10 @@ public interface IPileBillingTemplateService {
 
     // 批量查询站点计费模板
 	List<BillingTemplateVO> selectBillingTemplateByStationIdList(List<String> stationIdList);
+	/**
+	 * 修改站点计费模板状态并下发最新模板
+	 * @param pileBillingTemplate
+	 * @return
+	 */
+	int changeStationTemplate(PileBillingTemplate pileBillingTemplate);
 }