<<<<<<< Updated upstream D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\core\enums\BizDataTypeEnum.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\mapper\BizUserMapper.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\mapper\BizOrgMapper.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\param\BizOrgIdParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserPageParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserSelectorRoleParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\service\BizOrgService.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserExportParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\controller\BizDictController.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserSelectorPositionParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\service\impl\BizDictServiceImpl.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\mapper\BizPositionMapper.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\param\BizOrgEditParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\param\BizOrgPageParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserSelectorUserParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\param\BizPositionAddParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\controller\BizOrgController.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\core\config\BizConfigure.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\service\BizUserService.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\param\BizPositionIdParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\entity\BizOrg.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\service\impl\BizPositionServiceImpl.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\enums\BizUserStatusEnum.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\enums\BizOrgCategoryEnum.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\param\BizOrgSelectorUserParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\enums\BizPositionCategoryEnum.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\entity\BizUser.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserEditParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\result\BizUserExportResult.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\controller\BizUserController.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\core\enums\BizBuildInEnum.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\mapper\BizDictMapper.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\controller\BizPositionController.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\param\BizPositionEditParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\result\BizUserRoleResult.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\entity\BizPosition.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\param\BizOrgSelectorOrgListParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\param\BizPositionPageParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\param\BizOrgAddParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserImportParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserAddParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\service\BizDictService.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\service\impl\BizUserServiceImpl.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\enums\BizDictCategoryEnum.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\enums\BizRoleCategoryEnum.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\param\BizPositionSelectorPositionParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\service\BizPositionService.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\param\BizDictPageParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\param\BizDictEditParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserIdParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\service\impl\BizOrgServiceImpl.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserSelectorOrgListParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserGrantRoleParam.java D:\huimv-garden\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\entity\BizDict.java ======= G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\param\BizOrgSelectorOrgListParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\service\BizOrgService.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\param\BizDictPageParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserSelectorPositionParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\mapper\BizUserMapper.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\param\BizPositionSelectorPositionParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\param\BizOrgEditParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\param\BizPositionAddParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\core\enums\BizDataTypeEnum.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserAddParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\service\BizPositionService.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserExportParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\service\impl\BizDictServiceImpl.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\service\impl\BizOrgServiceImpl.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\enums\BizPositionCategoryEnum.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserEditParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\service\BizUserService.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\enums\BizUserStatusEnum.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\mapper\BizOrgMapper.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\enums\BizOrgCategoryEnum.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserGrantRoleParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\service\BizDictService.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\result\BizUserRoleResult.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserSelectorOrgListParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\param\BizPositionPageParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserImportParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\mapper\BizDictMapper.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\param\BizOrgIdParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\entity\BizUser.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\controller\BizOrgController.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserPageParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\service\impl\BizUserServiceImpl.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\entity\BizDict.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\enums\BizDictCategoryEnum.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\controller\BizDictController.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\mapper\BizPositionMapper.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserSelectorRoleParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\param\BizOrgPageParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\result\BizUserExportResult.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserIdParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\controller\BizPositionController.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\entity\BizPosition.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\param\BizPositionEditParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\param\BizOrgAddParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\controller\BizUserController.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\enums\BizRoleCategoryEnum.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\entity\BizOrg.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\org\param\BizOrgSelectorUserParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\user\param\BizUserSelectorUserParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\core\config\BizConfigure.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\dict\param\BizDictEditParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\param\BizPositionIdParam.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\core\enums\BizBuildInEnum.java G:\idea\huimv-2022\snowy\snowy-plugin\snowy-plugin-biz\src\main\java\vip\xiaonuo\biz\modular\position\service\impl\BizPositionServiceImpl.java >>>>>>> Stashed changes