Merge branch 'lcy' of http://47.107.53.207:3000/traineeCoder001/Bailian-Al

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/BrandController.java

@@ -178,17 +178,16 @@ public class BrandController extends BaseController {
     @PostMapping("/evolve")
     public R develop(@RequestBody ListQueryBody body) {
         List<String> addrCode = body.getAddrCode();
-        List<String> typeCode = body.getTypeCode(); // 网点分类（犇云）
         List<String> brandId = body.getBrandId();
         if (brandId == null || brandId.size() == 0) return R.fail("brandId不允许为空");
 
         // 获取redis缓存
-        String md5 = HashUtil.hash(addrCode.toString() + typeCode.toString() + brandId.toString(), "MD5");
+        String md5 = HashUtil.hash(addrCode.toString() + brandId.toString(), "MD5");
         Map<String, List<BrandEvolveVo>> map = (Map<String, List<BrandEvolveVo>>) redisTemplate.boundHashOps(RedisContant.BRAND_EVOLVE).get(md5);
         if (map != null) return R.ok(map);
 
         // Map<String, List<BrandEvolveVo>> stringListMap = brandService.searchEvolveByMulti(addrCode, typeCode, brandId);
-        Map<String, List<BrandEvolveVo>> listMap = brandService.searchEvolveByMulti2Map(addrCode, typeCode, brandId);
+        Map<String, List<BrandEvolveVo>> listMap = brandService.searchEvolveByMulti2Map(addrCode, null, brandId);
 
         redisTemplate.boundHashOps(RedisContant.BRAND_EVOLVE).put(md5, listMap);
         redisTemplate.expire(RedisContant.BRAND_EVOLVE, RedisContant.BRAND_EVOLVE_TIME, TimeUnit.MINUTES);