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

huliguo

7 天以前 c897a68da55d63439826d37be3cb13c5c0f95a48

 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;

}