Merge branch 'api' into hive2.0

jyy

2021-03-09 708fd530fe4c1565ca2f20707a911b03e59c925f

 zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java

@@ -19,6 +19,7 @@
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.PasswordUtil;
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.VipAnswerDao;
@@ -165,7 +166,7 @@
        if(!DataAuthUtil.hasAllShopAuth()) {
            sysVipInfo.setShopId(user.getShopId());
        }

        QueryUtil.setQueryLimitCom(sysVipInfo);
        return AjaxResult.buildSuccessInstance(sysVipInfoService.findAll(sysVipInfo));
    }