Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-24 bef458cd14d2e0f2b09d76b609291f47be3cd525

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

@@ -46,4 +46,7 @@

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

    //二维码数据
    private String qrCodeData;
}