|
|
04a5eae117
|
Merge branch 'develop' into feature-jie
代码检查 / 代码检查 (pull_request) Successful in 18s
|
2024-04-18 22:31:33 +08:00 |
|
|
|
e61b478225
|
Merge branch 'develop' into feature-zrx
代码检查 / 代码检查 (pull_request) Successful in 15s
|
2024-04-18 22:30:11 +08:00 |
|
176yunxuan
|
7d958bfa69
|
fix:申请模块根据名字查询项目，系统，模块
代码检查 / 代码检查 (pull_request) Successful in 16s
|
2024-04-18 22:25:07 +08:00 |
|
176yunxuan
|
5c33818e3d
|
fix:新增子系统，子模块，消息总数记录
代码检查 / 代码检查 (pull_request) Successful in 17s
|
2024-04-18 19:55:59 +08:00 |
|
xiangZr-hhh
|
9c4cb174eb
|
feat:新增日报模块查询我的日报接口
|
2024-04-18 16:08:40 +08:00 |
|
176yunxuan
|
e0d4d0e9c7
|
fix:添加项目权限，名字模糊查询项目
代码检查 / 代码检查 (pull_request) Successful in 19s
|
2024-04-18 15:17:08 +08:00 |
|
xiangZr-hhh
|
121b87c683
|
feat:新增日志模块日志添加接口
|
2024-04-18 15:01:05 +08:00 |
|
176yunxuan
|
2bd1d796ed
|
fix:我管理的状态查询
代码检查 / 代码检查 (pull_request) Successful in 17s
|
2024-04-17 20:43:27 +08:00 |
|
176yunxuan
|
d2dc0527ab
|
fix:查询子模块，删除子模块子系统
代码检查 / 代码检查 (pull_request) Successful in 18s
|
2024-04-17 20:30:31 +08:00 |
|
176yunxuan
|
84d3ccc5af
|
fix:我负责我管理我参与的项目查询重构以及项目增加,系统模块数据表增加截止时间和状态字段
|
2024-04-17 17:03:35 +08:00 |
|
|
|
3e67b5b94c
|
fix(总体、控制层): 修复错误内容
- 对权限登出的 Redis 进行处理
- 修复接口漏洞
|
2024-04-17 11:10:15 +08:00 |
|
|
|
87bb3fb069
|
feat: 添加权限检查功能，增强系统完整
|
2024-04-17 00:48:26 +08:00 |
|
|
|
a2cd19675e
|
refactor: 对权限组的重新配置
|
2024-04-16 23:56:20 +08:00 |
|
xiangZr-hhh
|
1a65d8ce8f
|
#patch:补丁
代码检查 / 代码检查 (pull_request) Successful in 19s
删除多余的log日志
|
2024-04-16 19:33:42 +08:00 |
|
xiangZr-hhh
|
f3840de509
|
Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx
# Conflicts:
# src/main/java/com/jsl/oa/controllers/ReviewController.java
# src/main/java/com/jsl/oa/dao/ProjectDAO.java
# src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java
# src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
|
2024-04-16 19:30:09 +08:00 |
|
xiangZr-hhh
|
36bbaf0995
|
fix:修正查询接口
代码检查 / 代码检查 (pull_request) Successful in 19s
修正分页与查询接口
|
2024-04-16 18:09:16 +08:00 |
|
|
|
76a1cf758c
|
patch: 优化日志处理模式，删除多余的日志信息
代码检查 / 代码检查 (pull_request) Successful in 23s
|
2024-04-16 17:29:21 +08:00 |
|
xiangZr-hhh
|
8ab59b5a1d
|
patch:补丁
代码检查 / 代码检查 (pull_request) Successful in 23s
修正部分数据表字段，修正对应接口
|
2024-04-16 16:07:06 +08:00 |
|
|
|
f153eb221e
|
Merge branch 'refs/heads/master' into feature-xiaolfeng
# Conflicts:
# src/main/java/com/jsl/oa/controllers/AuthController.java
# src/main/java/com/jsl/oa/utils/Processing.java
|
2024-04-16 15:03:26 +08:00 |
|
xiangZr-hhh
|
bc545bbd76
|
Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx
# Conflicts:
# src/main/java/com/jsl/oa/mapper/ProjectMapper.java
# src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
|
2024-04-16 14:31:33 +08:00 |
|
|
|
0eaf43c764
|
refactor: 修改用户服务实现，角色筛选由ID变更为名称
代码检查 / 代码检查 (push) Failing after 21s
|
2024-04-15 13:41:19 +08:00 |
|
|
|
fd22ba9dc6
|
feat: 新增从项目 id 获取项目详细信息的接口，并实现
|
2024-04-14 16:15:22 +08:00 |
|
|
|
05ccc3fdd8
|
patch: 部分内容进行补丁
代码检查 / 代码检查 (pull_request) Successful in 23s
- 拼写错误
- 未引入部分删除
|
2024-04-14 14:52:33 +08:00 |
|
176yunxuan
|
55cd033a7e
|
fix:初步重构
代码检查 / 代码检查 (pull_request) Successful in 30s
|
2024-04-13 20:42:42 +08:00 |
|
xiangZr-hhh
|
ec45c0b233
|
feat：增加新业务功能修改审核状态
代码检查 / 代码检查 (pull_request) Successful in 19s
|
2024-04-12 14:28:28 +08:00 |
|
xiangZr-hhh
|
ff34595002
|
feat：增加新业务功能新增审核
代码检查 / 代码检查 (pull_request) Successful in 20s
|
2024-04-12 09:20:51 +08:00 |
|
xiangZr-hhh
|
3b9a7cfe5e
|
feat：增加新业务功能获取我的审核
代码检查 / 代码检查 (pull_request) Successful in 22s
|
2024-04-12 08:20:28 +08:00 |
|
|
|
381de9d54b
|
patch: 漏洞修补，规范化
代码检查 / 代码检查 (pull_request) Successful in 20s
|
2024-04-11 20:22:42 +08:00 |
|
|
|
061d469c17
|
Merge branch 'refs/heads/develop' into feature-zrx
# Conflicts:
# src/main/java/com/jsl/oa/aspect/AnnotationsAspect.java
# src/main/java/com/jsl/oa/common/constant/SafeConstants.java
# src/main/java/com/jsl/oa/controllers/PermissionController.java
# src/main/java/com/jsl/oa/controllers/ProjectController.java
# src/main/java/com/jsl/oa/controllers/RoleController.java
# src/main/java/com/jsl/oa/controllers/UserController.java
# src/main/java/com/jsl/oa/dao/ProjectDAO.java
# src/main/java/com/jsl/oa/dao/RoleDAO.java
# src/main/java/com/jsl/oa/dao/UserDAO.java
# src/main/java/com/jsl/oa/mapper/ProjectMapper.java
# src/main/java/com/jsl/oa/mapper/RoleMapper.java
# src/main/java/com/jsl/oa/mapper/UserMapper.java
# src/main/java/com/jsl/oa/services/ProjectService.java
# src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
# src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
# src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java
# src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
# src/main/java/com/jsl/oa/utils/Processing.java
|
2024-04-11 20:17:32 +08:00 |
|
|
|
5f0e58ab06
|
feat: 代码规约修改，BUG 补丁
代码检查 / 代码检查 (pull_request) Successful in 19s
|
2024-04-11 19:31:16 +08:00 |
|
176yunxuan
|
b994aeefd8
|
feat:定时查找快到期项目提醒
代码检查 / 代码检查 (pull_request) Failing after 21s
|
2024-04-11 19:10:07 +08:00 |
|
xiangZr-hhh
|
365f2dfa67
|
feat：增加新业务功能获取审核列表
代码检查 / 代码检查 (pull_request) Failing after 21s
|
2024-04-11 17:27:34 +08:00 |
|
176yunxuan
|
3e0652034e
|
feat:消息模块
代码检查 / 代码检查 (pull_request) Failing after 19s
|
2024-04-10 21:10:39 +08:00 |
|
176yunxuan
|
3ca0bed1e1
|
feat:消息模块
代码检查 / 代码检查 (pull_request) Failing after 19s
|
2024-04-10 20:51:48 +08:00 |
|
|
|
fb5a8c06f6
|
feat: 代码风格规约调整
代码检查 / 代码检查 (pull_request) Failing after 27s
|
2024-04-10 10:34:55 +08:00 |
|
|
|
c273913442
|
feat: 代码风格调整
代码检查 / 代码检查 (pull_request) Failing after 19s
|
2024-04-10 09:37:39 +08:00 |
|
|
|
06bb45ba5d
|
patch: 符合开发规约
|
2024-04-10 01:22:31 +08:00 |
|
176yunxuan
|
e16dc1f745
|
分页查询和删除
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
|
2024-03-21 20:56:07 +08:00 |
|
|
|
86fe04a895
|
Upload
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
|
2024-03-17 12:45:19 +08:00 |
|
176yunxuan
|
14c726cb9a
|
返回信息调整
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-16 18:26:37 +08:00 |
|
176yunxuan
|
d05c6141dc
|
Merge branch 'feature'
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
|
2024-03-15 20:40:27 +08:00 |
|
176yunxuan
|
25e16c4264
|
id查询项目/系统
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-15 20:39:39 +08:00 |
|
|
|
424fddd2ed
|
Upload
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
|
2024-03-15 17:39:06 +08:00 |
|
176yunxuan
|
06c3be33e2
|
子系统子模块
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-14 21:43:27 +08:00 |
|
xiangZr-hhh
|
ef85c9fb60
|
项目文件接口
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-14 17:35:19 +08:00 |
|
176yunxuan
|
fb8336d44b
|
子系统子模块
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-14 11:42:26 +08:00 |
|
176yunxuan
|
d346711f1b
|
状态查询修改
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-13 12:54:11 +08:00 |
|
|
|
c7869775ef
|
Merge remote-tracking branch 'origin/feature' into feature
# Conflicts:
# src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
|
2024-03-12 21:04:41 +08:00 |
|
|
|
9280fa7d5d
|
Tag信息获取
|
2024-03-12 21:04:07 +08:00 |
|
xiangZr-hhh
|
1864f90fe0
|
用户信息接口修正
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-12 14:19:26 +08:00 |
|
