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

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java

@@ -279,6 +279,9 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 		String redisKey = CacheConstants.SELECT_PILE_STATION_INFO_BY_ID + pileStationInfo.getId();
 		redisCache.deleteObject(redisKey);
 
+		String templateRedisKey = CacheConstants.QUERY_STATION_BILLING_TEMPLATE_LIST + pileStationInfo.getId();
+		redisCache.deleteObject(templateRedisKey);
+
 		// 先查询一下当前数据库的充电站数据
 		PileStationInfo queryStationInfo = selectPileStationInfoById(pileStationInfo.getId());
 		String oldMerchantId = String.valueOf(queryStationInfo.getMerchantId());

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

@@ -49,6 +49,9 @@ public class BillingTemplateVO {
 	// 占桩费率（单位：元/分钟）
 	private BigDecimal occupyFee;
 
+	// 停车免费描述
+	private String parkFeeDescribe;
+
 	// 尖时段电费
 	private BigDecimal sharpElectricityPrice;
 	// 尖时段服务费