Merge remote-tracking branch 'origin/main'

yeg

2026-09-28 85bfb9351803d97a33329d507f30a2f78bf1fc75

 talent-card-server/src/main/java/com/talentcard/server/business/portal/CarWashMerchantPortalService.java

@@ -159,7 +159,7 @@
         String consumeDesc = text(right.get("consumeDesc"), "");
         if (!consumeDesc.isBlank()) return consumeDesc;
      }
      return text(service.get("tipText"), "请按现场指引操作");
      return text(service.get("tipText"), "到店后按现场指引操作，可直接享受洗车权益。");
   }

   private String rightsText(Map<String, Object> merchant, Map<String, Object> right, Map<String, Object> service) {