Merge remote-tracking branch 'origin/master'

MercuryZ

2022-03-31 ef270bd1855b5ce3f398c5df024840a498e33a8f

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

@@ -43,4 +43,7 @@
    private int min;
    //秒
    private int sec;

    //C3充电桩表查询关键字
    private String keyword;
}