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

Van333

2022-11-14 f8c33ad3fb09dd0f70b68b74d59ce28761142bf0

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java

@@ -30,7 +30,7 @@
     * @return
     */
    @GetMapping("/listWaterQualityEquipment")
    public ResponseVO<Object> listWaterQualityEquipment(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
    public ResponseVO<Object> listWaterQualityEquipment(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.WATER_EQUIPMENT_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }