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

Pu Zhibing

3 天以前 49c5117caef44d1e817d2ef701529dfaf1443467

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AppOrderTotalVo.java

@@ -13,9 +13,9 @@
@Data
public class AppOrderTotalVo {

    @ApiModelProperty("待支付统计")
    @ApiModelProperty(value="待支付统计")
    private Integer noPayCount;

    @ApiModelProperty("待核销统计")
    @ApiModelProperty(value="待核销统计")
    private Integer noUseCount;
}