Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107

Van333

2022-11-14 f8c33ad3fb09dd0f70b68b74d59ce28761142bf0

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java

@@ -222,8 +222,8 @@
            System.out.println("-----    " + collect);

            //获取当前时间
//            LocalTime localTime = LocalTime.now();
            LocalTime localTime = LocalTime.of(18, 00);
            LocalTime localTime = LocalTime.now();
//            LocalTime localTime = LocalTime.of(18, 00);
            System.out.println("time"+localTime);

            C3mChargingCharge temp1 = collect.get(collect.size() - 1);