Commit Graph

208 Commits

Author SHA1 Message Date
mashuanghui 52eebe3d52 查询修改 2024-08-20 14:21:54 +08:00
mashuanghui 47b67d96df Merge branch 'master' of https://gitea.chually.cn/chujinwang/chushangcloud 2024-08-19 19:39:19 +08:00
mashuanghui db4d2b6f66 数据字段修改 2024-08-19 19:39:10 +08:00
renzexin 638fcafd0a fix 项目列表-状态查询 2024-08-19 16:13:23 +08:00
likewei c6a74f8846 Merge remote-tracking branch 'origin/master' 2024-08-19 16:03:12 +08:00
likewei 975499e428 修改审核规则权限问题 2024-08-19 16:03:05 +08:00
mashuanghui 052d11f60e Merge branch 'master' of https://gitea.chually.cn/chujinwang/chushangcloud 2024-08-19 13:52:44 +08:00
mashuanghui b51d13397b 导出更改 2024-08-19 13:52:35 +08:00
renzexin d4cfa0ff25 fix 角色列表查询 2024-08-19 09:33:08 +08:00
mashuanghui 2a5d8a03b8 日期查询修改 2024-08-16 16:14:40 +08:00
renzexin fa5bc082a5 fix 项目管理-上传 2024-08-16 10:10:06 +08:00
mashuanghui e2aeed72b2 Merge branch 'master' of https://gitea.chually.cn/chujinwang/chushangcloud 2024-08-15 17:56:30 +08:00
mashuanghui 179a3fabae 修复日期无法筛选 2024-08-15 17:56:21 +08:00
renzexin 5321434d86 fix 项目管理-shangchuan 2024-08-15 17:05:37 +08:00
renzexin e6e997b179 fix 项目管理-shangchuan 2024-08-15 16:52:11 +08:00
Chujinwang e77cd63ae0 提交代码 2024-08-15 16:18:29 +08:00
renzexin 96b989d7b3 fix 项目管理-新增修改功能 2024-08-15 12:08:20 +08:00
renzexin 2a33f118fc fix 项目管理-新增修改时间类型 2024-08-15 11:33:18 +08:00
renzexin 375b617d83 fix 项目管理-新增修改时间类型 2024-08-15 11:31:52 +08:00
mashuanghui 6368eb5728 Merge branch 'master' of https://gitea.chually.cn/chujinwang/chushangcloud 2024-08-15 10:45:13 +08:00
mashuanghui 61c70f46a8 修复查询问题 2024-08-15 10:45:05 +08:00
likewei 7e5fdaff62 Merge remote-tracking branch 'origin/master' 2024-08-15 10:08:56 +08:00
likewei 8b2766838f 修改bug 2024-08-15 10:08:49 +08:00
renzexin 5c53d948ea fix 角色管理-状态和创建时间查询 2024-08-14 17:47:04 +08:00
renzexin 0ac37fba77 fix 项目列表-续签 2024-08-14 15:58:17 +08:00
mashuanghui 3e13344198 修复查询重复菜单问题 2024-08-14 15:25:35 +08:00
likewei a5931aa966 Merge remote-tracking branch 'origin/master' 2024-08-14 10:22:51 +08:00
likewei 42c12bf2ac 修改bug 2024-08-14 10:22:41 +08:00
renzexin 94fcdc0830 fix 任务列表-任务名称搜索不生效 2024-08-14 09:09:38 +08:00
Chujinwang 44abed9927 任务列表保存失败 2024-08-09 09:53:52 +08:00
Chujinwang 822650135c 权限标识 2024-08-06 09:35:11 +08:00
ant d1d6874178 Merge remote-tracking branch 'origin/master' 2024-08-01 10:34:39 +08:00
Chujinwang 1c7e3d2fc6 审核规则修改 2024-08-01 09:10:02 +08:00
ant 4901af59a8 1. 模版管理
2. 上传文件 异常
3. 分期 token 无效
2024-07-31 16:13:01 +08:00
ant 39873804a3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java
2024-07-31 15:20:00 +08:00
Chujinwang ba8285c918 bug修复 2024-07-31 15:16:29 +08:00
ant 9d638fb7a5 1. 江苏工行数据同步 2024-07-30 20:09:30 +08:00
ant 6ac373d254 Merge remote-tracking branch 'origin/master' 2024-07-30 09:06:21 +08:00
Chujinwang 6803f3cb0d 审核规则 2024-07-30 09:04:29 +08:00
ant 33f1b52a3b Merge remote-tracking branch 'origin/master' 2024-07-29 18:17:55 +08:00
ant bc685775f6 1. 字典修改bug 2024-07-29 18:17:47 +08:00
Chujinwang 085f766c8f 审核规则 2024-07-29 17:22:39 +08:00
ant 7137904683 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java
#	chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoMapper.java
#	chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java
#	chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml
2024-07-29 16:43:36 +08:00
ant e320ce60b3 1. 修改后台任务相关 2024-07-29 16:42:05 +08:00
Chujinwang f8dc29bc1d 人工数据 2024-07-29 15:52:41 +08:00
ant a8e997e260 1. 工单数据相关
2. 江苏工行代码创建
2024-07-29 15:17:10 +08:00
ant 3110b37f5d Merge remote-tracking branch 'origin/master' 2024-07-29 11:18:59 +08:00
ant ab9146e0f0 1. 去除version 字段修改导致 修改失败
2. 项目数据导出
3. oss 无法序列化问题
2024-07-29 11:18:49 +08:00
Chujinwang a995005fe7 财务数据 2024-07-29 10:54:31 +08:00
ant 3f82ff3ff1 1. 打开 ins的rocket 2024-07-29 10:00:36 +08:00