Merge branches '2.0' and '2.0' of http://120.76.84.145:10101/gitblit/r/java...

huliguo

6 天以前 7a74745bad7ff20df9e170433c1e1cb851ce7fa9

 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;

}