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

无关风月

昨天 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IncomeQuery.java

@@ -20,5 +20,5 @@
    private BigDecimal amount;
    // 用户ids
    private List<Integer> userIds;

    private Integer insertType;
}