Commit Graph
2486 Commits
Author SHA1 Message Date
wxyclub 9e0aca4304 bug: 政策法规资料导入带附件,内外部会议导入带附件 2023-11-23 18:14:57 +08:00
wxyclub 6065017dff bug: 国内外政策排序问题修改 2023-11-23 00:09:59 +08:00
mzaxd 147712b75c feat: 机构关联关联角色 2023-11-23 00:08:00 +08:00
wxyclub b93dd64f67 bug: 政策课题导入修改 2023-11-22 20:41:10 +08:00
wxyclub 502b274453 bug: 内外部会议导入问题 2023-11-22 20:29:13 +08:00
wxyclub 6bdc33869d bug: 国内外政策表头排序问题 2023-11-22 20:04:11 +08:00
wxyclub 92b43e3030 bug: 政策法规资料权限问题修改 2023-11-22 19:48:57 +08:00
wxyclub f3d0b6ca9c bug: 修改默认排序规则,分页查询 2023-11-22 18:22:35 +08:00
wxyclub 9c1e8b45fd bug: 内外部会议分页bug修改 2023-11-22 15:56:27 +08:00
gaosong 8ed946635b Revert "Revert "Merge branch 'fix_foton_20231031' into 'dev_20230829_change'""
This reverts commit 518270aec2.
2023-11-20 11:58:39 +08:00
高嵩 518270aec2 Revert "Merge branch 'fix_foton_20231031' into 'dev_20230829_change'"
This reverts merge request !138
2023-11-20 03:53:07 +00:00
wxyclub a15baee4c3 Merge remote-tracking branch 'origin/fix_foton_20231031' into fix_foton_20231031 2023-11-20 11:01:31 +08:00
wxyclub 5f1032a92b fix: 产品标准去除重复文件接口 2023-11-20 10:32:13 +08:00
高嵩 54034ff747 Merge branch 'dev_20230829_change' into 'fix_foton_20231031'
# Conflicts:
#   adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
2023-11-20 01:06:48 +00:00
高嵩 b1d1be63d8 Merge branch 'dev_20231101_TXSS' into 'dev_20230829_change'
Dev 20231101 txss

See merge request laws-foton-slrs/foton-slrs-system-rest!136
2023-11-20 00:58:24 +00:00
mzaxd 7c4b855f0d feat: 国标外表新增编辑标准体系保存 2023-11-17 17:41:01 +08:00
mzaxd 3467371f69 feat: 体系搜索数据列表导出 2023-11-17 10:16:52 +08:00
mzaxd 89246b42e5 fix: 体系数据列表数据条数错误 2023-11-16 18:10:10 +08:00
wxyclub d48e055e29 fix: 添加删除日志记录 2023-11-16 16:27:39 +08:00
mzaxd 8430e92b2b feat: 体系数据列表筛选条件失效BUG 2023-11-16 14:35:05 +08:00
mzaxd 55ba8d09e8 perf: 大幅提高体系搜索接口性能 2023-11-16 13:45:51 +08:00
mzaxd c48b663c50 feat: 体系数据列表 release 2023-11-16 13:33:33 +08:00
高嵩 25a6ebeaf9 Merge branch 'fix_foton_20231031' into 'dev_20230829_change'
Fix foton 20231031

See merge request laws-foton-slrs/foton-slrs-system-rest!135
2023-11-16 03:46:10 +00:00
wxyclub b9f3d09346 bug: 78295内外部会议添加创建时间和修改时间字段,添加创建时间排序 2023-11-16 11:06:18 +08:00
wxyclub d4b2f09ca9 bug: 搜索中心字段排序问题 2023-11-15 18:36:08 +08:00
mzaxd 23190a0b96 fix: 体系数据列表手动分页层级错误 2023-11-15 15:21:34 +08:00
mzaxd d881d5cfc7 fix: 体系数据列表手动分页层级错误 2023-11-15 15:19:42 +08:00
mzaxd e0918cf94a feat: 体系数据列表手动分页 2023-11-15 15:11:47 +08:00
mzaxd ac9bf76ab2 fix: 体系数据列表查询条件判断错误 2023-11-15 14:46:58 +08:00
mzaxd 43eb0769e1 feat: 体系数据列表 preview version 2023-11-15 14:31:18 +08:00
mzaxd a3f6748a36 feat: 体系树增加层级字段 2023-11-15 10:53:26 +08:00
wxyclub 47b1e65de3 bug: 搜索中心字段排序问题 2023-11-14 18:30:28 +08:00
mzaxd 5215be2d97 feat: 体系搜索树接口 2023-11-14 17:10:47 +08:00
mzaxd 9655f55303 feat: 剔除岗位 2023-11-14 15:49:03 +08:00
wxyclub bf5d364791 bug: 78295内外部会议会议议题顺序按照议题名称排序 2023-11-14 14:25:59 +08:00
wxyclub 097d6652ce bug: 78302内外部会议详情更新记录不准确修改 2023-11-14 14:19:18 +08:00
wxyclub 8a25004f71 bug: 78317政策课题查看更新记录显示问题 2023-11-14 13:53:52 +08:00
wxyclub 02db88e2a3 bug: 78224政策法规资料、内外部会议、政策课题时间区间查询问题 2023-11-14 11:23:44 +08:00
wxyclub d8a4a763b8 bug: 搜索中心字段排序问题 2023-11-13 20:04:09 +08:00
wxyclub a9cbca0c00 bug: 搜索中心字段排序问题 2023-11-13 19:47:41 +08:00
wxyclub 8861bf93f2 bug: 搜索中心字段排序问题 2023-11-13 18:50:28 +08:00
mzaxd 0ec7236ead ci: 计划有变 先改权限 2023-11-13 18:09:51 +08:00
mzaxd a890f7f678 feat: 标准体系物理删除 2023-11-13 17:55:11 +08:00
wxyclub ec0c40f7ca bug: 78317政策课题修改记录修改 2023-11-13 15:04:10 +08:00
wxyclub b9ff91d5d6 bug: 78422政策法规资料和政策课题导入导出字段名保持一致 2023-11-13 14:26:12 +08:00
wxyclub b550395b10 bug: 企标计划、国内、海外、企标导出修改字段 2023-11-13 13:47:45 +08:00
高嵩 2eae78fe52 Merge branch 'fix_foton_20231031' into 'dev_20230829_change'
Fix foton 20231031

See merge request laws-foton-slrs/foton-slrs-system-rest!132
2023-11-13 04:33:49 +00:00
wxyclub eac7f3395f bug: 企标计划、国内、海外、企标导出修改字段 2023-11-13 12:24:46 +08:00
wxyclub f71115e045 bug: 政策资料修改 2023-11-13 10:29:04 +08:00
wxyclub ec72e577f4 bug: 搜索中心排序修改 2023-11-13 09:08:40 +08:00