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

无关风月

8 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

 cloud-server-other/src/main/java/com/dsh/other/model/BillingRequestOfType.java

@@ -17,8 +17,12 @@
     * MM-dd HH:mm
     */
    private String time;
    private String time1;

    /**
     * 金额
     */
    private double amount;

    private Long dateTime;
}