|
|
04a5eae117
|
Merge branch 'develop' into feature-jie
代码检查 / 代码检查 (pull_request) Successful in 18s
|
2024-04-18 22:31:33 +08:00 |
|
|
|
f076baeccf
|
Merge pull request 'feature-zrx' (#24) from feature-zrx into develop
Reviewed-on: #24
|
2024-04-18 22:30:34 +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
|
84b2ab983a
|
fix:审核模块查询接口修正
代码检查 / 代码检查 (pull_request) Successful in 16s
返回数据增加部分属性
|
2024-04-18 17:32:08 +08:00 |
|
xiangZr-hhh
|
f491d9a97f
|
fix:审核查询接口修正
代码检查 / 代码检查 (pull_request) Successful in 18s
|
2024-04-18 17:04:30 +08:00 |
|
xiangZr-hhh
|
0d05ea08fb
|
fix:审核查询接口修正
增加部分权限判断
|
2024-04-18 16:53:11 +08:00 |
|
|
|
893b5b2f7c
|
Merge pull request 'feature-jie' (#22) from feature-jie into develop
代码检查 / 代码检查 (pull_request) Successful in 17s
Reviewed-on: #22
|
2024-04-18 16:32:10 +08:00 |
|
xiangZr-hhh
|
9c4cb174eb
|
feat:新增日报模块查询我的日报接口
|
2024-04-18 16:08:40 +08:00 |
|
|
|
3e2b10c049
|
fix(业务): 业务补丁
代码检查 / 代码检查 (pull_request) Successful in 16s
json 补丁
|
2024-04-18 15:21:38 +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 |
|
xiangZr-hhh
|
71bd92d18e
|
patch:修正review数据库表
删除部分错误外键
|
2024-04-18 10:18:35 +08:00 |
|
176yunxuan
|
3df0c754d3
|
fix:查询项目重构
|
2024-04-18 09:34:23 +08:00 |
|
|
|
96c5b5f98c
|
Merge pull request 'develop' (#21) from develop into master
代码检查 / 代码检查 (push) Successful in 19s
Reviewed-on: #21
|
2024-04-17 23:08:53 +08:00 |
|
|
|
2880ffefa7
|
Merge pull request 'feature-jie' (#19) from feature-jie into develop
代码检查 / 代码检查 (pull_request) Successful in 18s
Reviewed-on: #19
|
2024-04-17 21:03:29 +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 |
|
|
|
0516e8dce4
|
perf(配置): 添加启动项
添加启动项 wyj 配置文件
|
2024-04-17 15:20:10 +08:00 |
|
|
|
80478baf76
|
fix(service): 修复获取不到用户信息
代码检查 / 代码检查 (push) Successful in 18s
修复对于 token 的解析获取无法获取到 userDO 的情况进行异常返回
|
2024-04-17 11:20:40 +08:00 |
|
|
|
a10fbce2f8
|
Merge branch 'refs/heads/develop'
代码检查 / 代码检查 (push) Successful in 20s
|
2024-04-17 11:12:01 +08:00 |
|
|
|
6b0c58dea9
|
Merge pull request 'bug:消息分页返回增加总数等字段' (#18) from feature-jie into develop
Reviewed-on: #18
Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>
|
2024-04-17 11:11:40 +08:00 |
|
|
|
3e67b5b94c
|
fix(总体、控制层): 修复错误内容
- 对权限登出的 Redis 进行处理
- 修复接口漏洞
|
2024-04-17 11:10:15 +08:00 |
|
176yunxuan
|
22cb95d1d3
|
bug:消息分页返回增加总数等字段
代码检查 / 代码检查 (pull_request) Successful in 16s
|
2024-04-17 10:53:25 +08:00 |
|
|
|
045147dc30
|
patch: 补丁
代码检查 / 代码检查 (push) Successful in 16s
|
2024-04-17 01:13:57 +08:00 |
|
|
|
75d471b1b6
|
patch: 补丁
代码检查 / 代码检查 (push) Successful in 19s
|
2024-04-17 01:09:42 +08:00 |
|
|
|
65a13ff549
|
Merge pull request 'Merge 推送至业务' (#17) from develop into master
代码检查 / 代码检查 (push) Successful in 27s
Reviewed-on: #17
|
2024-04-17 00:55:36 +08:00 |
|
|
|
0a788005a6
|
patch: 补丁
代码检查 / 代码检查 (pull_request) Successful in 20s
|
2024-04-17 00:52:55 +08:00 |
|
|
|
87bb3fb069
|
feat: 添加权限检查功能，增强系统完整
|
2024-04-17 00:48:26 +08:00 |
|
|
|
a2cd19675e
|
refactor: 对权限组的重新配置
|
2024-04-16 23:56:20 +08:00 |
|
|
|
f0f6e53ba2
|
feat: 添加了15个数据表结构定义，调整了部分数据表的创建语句，更新了数据准备脚本。
|
2024-04-16 22:31:30 +08:00 |
|
|
|
2086361a8d
|
Merge branch 'refs/heads/feature-xiaolfeng' into develop
|
2024-04-16 21:59:50 +08:00 |
|
|
|
b368dadc3c
|
fix：调整权限验证逻辑，修复访问空指针问题，优化日志信息，调整审核查询接口字段名称，修正查询接口分页问题。
|
2024-04-16 21:59:39 +08:00 |
|
|
|
fe62d918dc
|
Merge pull request 'bug:消息修改' (#16) from feature-jie into develop
Reviewed-on: #16
Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>
|
2024-04-16 21:59:03 +08:00 |
|
|
|
e5b87e6f4f
|
fix: 访问为空以及错误补丁
代码检查 / 代码检查 (pull_request) Successful in 19s
|
2024-04-16 21:47:43 +08:00 |
|
|
|
49bcadd483
|
Merge branch 'develop' into feature-jie
代码检查 / 代码检查 (pull_request) Successful in 20s
|
2024-04-16 21:39:54 +08:00 |
|
|
|
1d914a5217
|
Merge pull request 'feat：增加新业务功能获取我的审核' (#13) from feature-zrx into develop
Reviewed-on: #13
Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>
|
2024-04-16 21:39:25 +08:00 |
|
176yunxuan
|
7db82c57e2
|
bug:消息修改
代码检查 / 代码检查 (pull_request) Successful in 18s
|
2024-04-16 19:40:05 +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
|
cd65a5c6f8
|
fix:调整查询接口
代码检查 / 代码检查 (pull_request) Successful in 19s
调整所有审核查询接口的部分字段名称
|
2024-04-16 19:00:32 +08:00 |
|
xiangZr-hhh
|
cb1d61da88
|
fix:修正查询接口
代码检查 / 代码检查 (pull_request) Successful in 19s
分页修正
|
2024-04-16 18:20:06 +08:00 |
|
xiangZr-hhh
|
36bbaf0995
|
fix:修正查询接口
代码检查 / 代码检查 (pull_request) Successful in 19s
修正分页与查询接口
|
2024-04-16 18:09:16 +08:00 |
|
|
|
0c429bc07f
|
Merge pull request 'fix: 对内容的补丁修复' (#15) from feature-xiaolfeng into develop
Reviewed-on: #15
|
2024-04-16 17:31:50 +08:00 |
|
|
|
76a1cf758c
|
patch: 优化日志处理模式，删除多余的日志信息
代码检查 / 代码检查 (pull_request) Successful in 23s
|
2024-04-16 17:29:21 +08:00 |
|
|
|
7b1cead10e
|
refactor: 更新代码以处理未登录异常，优化角色筛选方式，并准备安全相关内容。
|
2024-04-16 16:44:41 +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 |
|
