Merge branch 'master' of http://81.70.224.233:10080/slambb/FragrantTown_Server_Local

src/main/java/com/td/boss/game/complayercultivate/serivce/ComPlayerCultivateSerivceImpl.java

@@ -75,7 +75,7 @@ public class ComPlayerCultivateSerivceImpl implements ComPlayerCultivateSerivce
             return Result.of(null, false, ResultEnum.LAND_DATA_ERROR.getMessage(), ResultEnum.LAND_DATA_ERROR.getCode());
         }
         ComPlayerLand comPlayerLand = comPlayerLandService.findByUserIdAndLandId(userId, configLandId);
-        if (ArrayUtil.contains(CultivateKeys.mallType, comPlayerLand.getMallType()) == false) {
+        if (ArrayUtil.contains(CultivateKeys.mallType, comConfigLand.getMallType()) == false) {
             return Result.of(null, false, ResultEnum.LAND_DATA_ERROR.getMessage(), ResultEnum.LAND_DATA_ERROR.getCode());
         }
         String _redisKey = "LOCK:COM_PLAYER_CULTIVATE_LAND:" + userId;