Merge branch 'dev' into user_action

peng

2025-09-19 b7df7af3289cabe6cf8a23f314d803fc144a913e

 framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java

@@ -187,6 +187,17 @@
    private String orderType;

    /**
     * @see CouPonFlagEnum
     */
    @ApiModelProperty(value = "是否是礼品卡")
    private String couponFlag;
    /**
     * 订单地址修改状态
     */
    @ApiModelProperty(value = "订单地址修改状态")
    private String modifyAddressFlag;

    /**
     * @see OrderPromotionTypeEnum
     */
    @ApiModelProperty(value = "订单促销类型")