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

无关风月

4 天以前 c560f1a14ae1fc468d90e50e6a32d805295875da

 cloud-server-activity/src/main/java/com/dsh/activity/entity/ConsumeDetail.java

@@ -19,4 +19,6 @@
    @ApiModelProperty(value = "1充值 2扣除")
    private Integer type;

    private Long dateTime;

}