Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

 zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java

@@ -7,13 +7,13 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelUtil;
import com.matrix.core.tools.excl.ExcelVersion;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.bean.SystemDictionary;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.CustomerDataDictionaryDao;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.service.SystemDictionaryService;
@@ -334,8 +334,14 @@
    @RequestMapping(value = "/del")
    public @ResponseBody
    AjaxResult del(String keys) {

        return remove(vipInfoService, 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);
    }

    /**