 liyawei
|
c2c50b4352
|
操作日志-部门显示修改
|
2022-10-25 12:43:20 +08:00 |
|
|
zyd
|
b9afd7ff0c
|
Merge branch 'develop_master' into FOTON
|
2022-10-24 22:32:24 +08:00 |
|
|
zyd
|
5a01009cf8
|
Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master
|
2022-10-24 22:31:08 +08:00 |
|
|
liyawei
|
9e60b22671
|
修改企标复审入库流程：非修订时才修改文本状态
|
2022-10-24 20:19:09 +08:00 |
|
|
liyawei
|
b20d14a562
|
修改企标复审入库流程：修订时才生成企标计划
|
2022-10-24 17:48:05 +08:00 |
|
|
zyd
|
991c299c10
|
fix: 修复BUG
|
2022-10-24 16:10:01 +08:00 |
|
|
zyd
|
8c01b11d18
|
fix:修复再处理被代替标准号数据补全时，数据补充错误导致无法更新状态的BUG
|
2022-10-24 11:04:46 +08:00 |
|
|
zhangyanduan
|
5f1b490954
|
fix:增加日志输出以及输出的内容
|
2022-10-21 10:20:06 +08:00 |
|
|
zhangyanduan
|
979f1631fc
|
Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master
|
2022-10-21 09:47:15 +08:00 |
|
|
zhangyanduan
|
9542200d13
|
fix: 新增手动启动定时任务接口
|
2022-10-21 09:47:06 +08:00 |
|
|
CD
|
73945de1cf
|
适用车型为空会出现bug
|
2022-10-20 21:27:01 +08:00 |
|
|
zhangyanduan
|
14c3354739
|
Merge branch 'develop_master' into FOTON
|
2022-10-20 17:26:24 +08:00 |
|
|
CD
|
04749fd69d
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-10-20 14:13:53 +08:00 |
|
|
CD
|
fe37063ba4
|
日志
|
2022-10-20 14:13:27 +08:00 |
|
|
zyd
|
768c64e209
|
Merge branch 'develop_master' into FOTON
|
2022-10-19 22:14:32 +08:00 |
|
|
liyawei
|
7fc50fb4e0
|
资料中心查询去重
|
2022-10-18 09:42:06 +08:00 |
|
|
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 |
|