Merge branch 'test' into 'four_member'

罗元桥

2021-09-24 09e41d546b030b47661877d4b8141c88584d7598

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -6,6 +6,8 @@

import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.*;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestParam;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -166,4 +168,11 @@

    int putUserTag(@Param("sysUserDO") SysUserDO sysUserDO);

    /**
     * 禁用/启用便民服务商家账号
     * @param status
     * @param userIds
     * @return
     */
    int disableOrEnableMerchantUsers(@Param("status") Integer status, @Param("userIds") List<Long> userIds);
}