Merge remote-tracking branch 'origin/master'

liuhaonan

2022-07-04 9ac2e19354e455a6694a867430e0f5146d51c4ea

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/C3mChargingChargeParam.java

@@ -29,4 +29,7 @@
     */
    private Double charge;


    private Long timestamp;

}