Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-17 383b33fdfb1a01b27b8ecda7a46fd8e5e5d4d0f2

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

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


    private Long timestamp;

}