Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -297,8 +297,9 @@ public class DataUtils {
     public List<KylinPerformanceVo> getPerformancesListOfcityNameOradCode(String cityName, Integer adCode) {
         if (!cityName.isEmpty()) {
             if (!cityName.endsWith("州") && !cityName.endsWith("县") && !cityName.endsWith("区") && !cityName.endsWith("市")) {
-                adCode = CityJsonUtils.get(cityName.concat("市"));
+                cityName = cityName.concat("市");
             }
+            adCode = CityJsonUtils.get(cityName);
         }
         String redisKey = KylinRedisConst.PERFORMANCES_LIST_CITY.concat(String.valueOf(adCode));
         Object object = redisUtil.get(redisKey);