Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-04-13 1bcef6a688ffbee58c347bbd87e1b5db08075041

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

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

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

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