FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,020 Commits 1 Branch 0 Tags
3d05df1055db3d351635c36b297a656fa0272cd3
Commit Graph
3020 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CD 2246c96ce0 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-10-17 17:25:43 +08:00
CD 0a491e93f8 分数是空字符串的bug 2022-10-17 17:25:23 +08:00
liyawei b038ac6f3d 添加:角色管理配置资料中心权限功能 2022-10-17 16:03:50 +08:00
liyawei 0ebdd2f435 解决: 企标制修订立项计划流程，程结束之后，查看计划库归档，立项单填写的内容没有归档 2022-10-14 15:08:17 +08:00
CD 01986f8b1c Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-10-14 10:46:46 +08:00
CD 8edad2bcd3 企标计划 2022-10-14 10:46:20 +08:00
zhangyanduan 730a3e153f Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-10-13 18:09:32 +08:00
zhangyanduan 12635bbdc4 fix: 修复文件检查错误的BUG 2022-10-13 18:09:17 +08:00
liyawei bb8021122e 企标制修订-技术标准流程,起草单位高级经理审核节点，导出意见 2022-10-13 14:57:51 +08:00
liyawei 61e8851ebf 企标制修订-技术标准流程,起草单位高级经理审核节点，导出意见 2022-10-13 13:51:54 +08:00
zhangyanduan 91e26a51c5 fix: 修复代码错误 2022-10-13 11:06:15 +08:00
zhangjun 3f1e3f71aa 重置索引 2022-10-13 09:28:38 +08:00
zhangjun d0e7a5f96f Merge remote-tracking branch 'origin/develop_master' into FOTON 2022-10-13 09:03:12 +08:00
zyd 452ed1920b add:解决加密文件问题 2022-10-13 00:53:48 +08:00
zyd 65b66cc38c fix: 修复BUG 2022-10-12 23:52:39 +08:00
zyd d67bfea609 Merge branch 'develop_master' into FOTON 2022-10-12 23:44:28 +08:00
zyd d6771eabe1 fix: 修复BUG 2022-10-12 23:43:55 +08:00
zyd f96370df40 Merge branch 'develop_master' into FOTON 2022-10-12 23:10:47 +08:00
zyd 3c89f8bdbd add: 更新swagger接口配置参数 2022-10-12 23:10:35 +08:00
zyd 522e1e1416 Merge branch 'develop_master' into FOTON 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
 2022-10-12 23:00:26 +08:00
zyd c266ddc4a1 add:检查文件是否为加密文件的判断代码逻辑 2022-10-12 22:58:48 +08:00
zhangjun 8f74bbfbd9 删除索引信息 2022-10-12 12:09:05 +08:00
zyd 5e4ca83210 Merge branch 'develop_master' into FOTON 2022-10-11 22:51:55 +08:00
zhangjun 5f6fa80e16 搜索中心同步删除 2022-10-11 15:00:41 +08:00
zhangjun 376cc3bab9 搜索中心同步删除 2022-10-11 14:59:52 +08:00
zyd 9793e7bb65 Merge branch 'develop_master' into FOTON 2022-10-10 21:47:01 +08:00
zhangyanduan bd93dc1d44 fix:提交未同步到生产环境得表结构 2022-10-10 17:15:53 +08:00
zhangyanduan 585b7d6b75 fix:修复企标体系数据挂靠目录关系逻辑优化 2022-10-10 16:37:21 +08:00
zyd af42065586 Merge branch 'develop_master' into FOTON 2022-10-09 23:06:55 +08:00
liyawei f8775844d3 国内外企标添加移动标准功能 2022-10-09 20:41:59 +08:00
liyawei 74e856d6d5 国内外企标添加移动标准功能 2022-10-09 18:38:12 +08:00
zhangjun b174191045 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-10-08 17:42:21 +08:00
zhangjun 3f5515b77b sql 不想删了，暂时保留，这个是前端bug，只需去掉control层代码即可 2022-10-08 17:42:01 +08:00
zhangyanduan 36c94e2aaf fix: 修复导入模板时按照上传解密后的文件进行解析 2022-10-08 13:54:05 +08:00
zhangjun 3d924b4cfb Merge remote-tracking branch 'origin/FOTON' into FOTON 2022-10-08 09:02:21 +08:00
zhangjun 4017583752 搜索中心日志 2022-10-08 09:01:14 +08:00
zyd 6702be7464 Merge branch 'develop_master' into FOTON 2022-10-01 19:08:24 +08:00
zyd 8a77f17b43 update:自启动定时任务增加参数主机管控 2022-10-01 19:08:12 +08:00
zyd 72e59f25a7 Merge branch 'develop_master' into FOTON 2022-10-01 18:21:41 +08:00
zhangjun d4e592e21f 添加定时任务 ip 字段 2022-09-30 17:39:46 +08:00
zhangjun 03ab40bbe1 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-09-30 17:34:05 +08:00
zyd 8ff7b4b8ac fix: 错误日志全部输出到日志文件中 2022-09-30 02:08:40 +08:00
zhangjun 42274fb6b0 修改搜索中心添加并查询资源类型、能源类型 2022-09-29 20:58:04 +08:00
zhangyanduan 83cbe979bb Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-09-29 17:14:05 +08:00
zhangyanduan 822437e364 fix: 修复搜索中心颜色显示 2022-09-29 17:13:53 +08:00
zhangjun 326c3f1cc9 修改搜索中心添加并查询资源类型、能源类型 2022-09-29 17:00:42 +08:00
zhangjun 761727e63c 修改搜索中心添加并查询资源类型、能源类型 2022-09-29 16:56:13 +08:00
zhangjun d105dce3a5 标准预警模块导出excel缺少条款内容 2022-09-29 15:00:09 +08:00
zhangjun 97f12bdef1 代替标准号超链接打不开 2022-09-29 14:40:03 +08:00
zhangjun bc0d3a878a 修改搜索中心添加并查询资源类型、能源类型 2022-09-29 14:14:03 +08:00