Merge branch 'developer' into alpha

姜友瑶

2022-05-17 206b2a8034f066f7f4d08755abfee3f5049d0632

 zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java

@@ -185,8 +185,15 @@
    @RequestMapping(value = "/del")
    public @ResponseBody
    AjaxResult del(String keys) {
        List<Long> ids = StringUtils.strToCollToLong(keys, ",");
        int i = vipInfoService.removeLogic(ids);
        if (i > 0) {
            return new AjaxResult(AjaxResult.STATUS_SUCCESS, "成功删除" + i + "条数据");
        } else {
            return new AjaxResult(AjaxResult.STATUS_FAIL, "删除失败");
        }

        return remove(vipInfoService, keys);
//        return remove(vipInfoService, keys);
    }

    /**