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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 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;
}