Merge remote-tracking branch 'origin/bjcz_his_scrm' into bjcz_his_scrm

fs-company/src/main/java/com/fs/company/controller/store/FsUserController.java

@@ -296,5 +296,4 @@ public class FsUserController extends BaseController
         Boolean r = userCompanyUserService.batchUpdateUserProjectStatus(ids, 1);
         return ResponseResult.ok(r);
     }
-
 }

fs-service/src/main/java/com/fs/his/service/impl/FsUserServiceImpl.java

@@ -12,6 +12,7 @@ import com.fs.common.core.domain.entity.SysDictData;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.enums.ImTypeEnum;
+import com.fs.common.exception.ServiceException;
 import com.fs.common.param.LoginMaWxParam;
 import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.DictUtils;
@@ -1464,5 +1465,4 @@ public class FsUserServiceImpl implements IFsUserService {
         fsUserMapper.removeUser(id);
         return R.ok();
     }
-
 }