Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppPlaceActivityDto.java

@@ -39,4 +39,7 @@
    @ApiModelProperty(value = "订单备注")
    private String orderRemark;

    @ApiModelProperty(value = "获客标记",hidden = true)
    private Integer newMemberFlag;

}