Merge remote-tracking branch 'origin/user_action' into user_action

zxl

2025-10-11 3b2c5fb47caca6ab286e0c8ed8c0575024c528d0

 framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java

@@ -293,7 +293,6 @@
     * @see PromotionTypeEnum
     * value 为 促销活动实体信息
     */
    @Field(type = FieldType.Text)
    @ApiModelProperty("商品促销活动集合JSON，key 为 促销活动类型，value 为 促销活动实体信息 ")
    private String promotionMapJson;
    @ApiModelProperty(value = "商品排序")