Merge branch 'developer'

姜友瑶

2022-05-23 eaefb5f0d4fb5918786936dd60f4be7dd93011ba

 zq-erp/src/main/java/com/matrix/system/common/service/SysUsersService.java

@@ -3,6 +3,7 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.common.bean.SysUserLoginRecord;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.hive.bean.AppVersion;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysProjServices;

@@ -170,5 +171,9 @@
    public int findByCodeBeaStateShopCount(Long shopId,
                                           SysProjServices sysProjServices, List<String> panBanCodes);

    public List<AppVersion> findAppVersion();

    SysUsers findByOpenId(String openId, Long companyId);

    int modifyUserOpenId(String openId, Long suId);
}