 高嵩
|
fd759dba25
|
合并分支 'fix_foton_20230613' 到 'master'
Fix foton 20230613
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!111
|
2023-06-20 14:38:06 +08:00 |
|
|
gaojiabao
|
c5c75fa1bd
|
Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613
|
2023-06-20 13:24:15 +08:00 |
|
|
gaojiabao
|
896e1a6448
|
在线编辑文件无法被有效区分
|
2023-06-20 13:24:02 +08:00 |
|
|
SUNJIABIN
|
e4cdc7621b
|
新增同步es数据的定时任务
|
2023-06-20 11:46:56 +08:00 |
|
|
gaojiabao
|
24d44f8eef
|
数组越位异常
|
2023-06-20 10:47:43 +08:00 |
|
|
高嵩
|
93560af7e7
|
合并分支 'fix_foton_20230613' 到 'master'
Fix foton 20230613
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!110
|
2023-06-19 17:19:03 +08:00 |
|
|
gaojiabao
|
853e86279a
|
Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613
|
2023-06-19 16:24:35 +08:00 |
|
|
gaojiabao
|
9eb859c6c4
|
企标修改空指针问题
|
2023-06-19 16:23:56 +08:00 |
|
|
wxyclub
|
c204a21b12
|
Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613
|
2023-06-19 16:22:13 +08:00 |
|
|
wxyclub
|
c2b779c3c0
|
add:修改对外PDMC读取文件接口查询
|
2023-06-19 16:19:54 +08:00 |
|
|
gaojiabao
|
579b54d2be
|
39测试
|
2023-06-19 14:45:43 +08:00 |
|
|
gaojiabao
|
3a523968c9
|
文件处理测试
|
2023-06-19 14:26:17 +08:00 |
|
|
gaojiabao
|
d584481550
|
Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613
|
2023-06-19 13:45:15 +08:00 |
|
|
gaojiabao
|
11c1a29710
|
39 测试调用在线编辑文件获取
|
2023-06-19 13:43:48 +08:00 |
|
|
高嵩
|
84c6ac5fd9
|
合并分支 'fix_foton_20230613' 到 'master'
Fix foton 20230613
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!109
|
2023-06-19 12:46:05 +08:00 |
|
|
SUNJIABIN
|
bb6ad10c5a
|
新增'企标发布节点完成任务和入库接口执行前先执行校验编号和名称校验'接口
|
2023-06-19 09:54:18 +08:00 |
|
|
SUNJIABIN
|
fecfd518d5
|
新增'企标发布节点完成任务和入库接口执行前先执行校验编号和名称校验'接口
|
2023-06-19 09:15:34 +08:00 |
|
|
高嵩
|
4afc0a662e
|
合并分支 'fix_foton_20230613' 到 'master'
Fix foton 20230613
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!108
|
2023-06-16 17:51:56 +08:00 |
|
|
gaojiabao
|
1ffad40423
|
Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613
|
2023-06-16 17:49:15 +08:00 |
|
|
gaojiabao
|
078dfef0bf
|
条件导出
|
2023-06-16 17:48:26 +08:00 |
|
|
高嵩
|
a34c5ec7ac
|
合并分支 'fix_foton_20230613' 到 'master'
入库时校验优化
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!107
|
2023-06-16 17:36:59 +08:00 |
|
|
SUNJIABIN
|
1a11394e5b
|
入库时校验优化
|
2023-06-16 17:36:04 +08:00 |
|
|
高嵩
|
b4bc81eb43
|
合并分支 'fix_foton_20230613' 到 'master'
Fix foton 20230613
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!106
|
2023-06-16 17:07:36 +08:00 |
|
|
gaojiabao
|
c8d0cf9a76
|
企业标准条件查询导出
|
2023-06-16 17:03:03 +08:00 |
|
|
gaojiabao
|
e535793bde
|
mq批量文件pdf+导出全部功能
|
2023-06-16 16:38:33 +08:00 |
|
|
gaojiabao
|
ede83fe43e
|
39 测试
|
2023-06-16 13:49:20 +08:00 |
|
|
gaojiabao
|
573890103f
|
39 测试
|
2023-06-15 15:31:13 +08:00 |
|
|
gaojiabao
|
76b2eea8f2
|
Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613
|
2023-06-15 15:05:33 +08:00 |
|
|
gaojiabao
|
61c5225319
|
39 测试
|
2023-06-15 15:04:57 +08:00 |
|
|
高嵩
|
bf3998d8b7
|
合并分支 'fix_foton_20230613' 到 'master'
add:修改对外PDMC读取文件接口查询
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!105
|
2023-06-15 11:37:57 +08:00 |
|
|
wxyclub
|
6411deb8a6
|
add:修改对外PDMC读取文件接口查询
|
2023-06-15 11:16:02 +08:00 |
|
|
高嵩
|
812d2533f0
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!104
|
2023-06-15 09:24:05 +08:00 |
|
|
gaojiabao
|
12b642f0a8
|
退回pdf
|
2023-06-15 09:22:22 +08:00 |
|
|
gaojiabao
|
5985b060a8
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-06-14 15:57:41 +08:00 |
|
|
gaojiabao
|
a67f4a1ce4
|
pdf转换（样式）
|
2023-06-14 15:57:20 +08:00 |
|
|
SUNJIABIN
|
8690fcb35f
|
优化同步人员数据的定时任务
|
2023-06-14 14:32:05 +08:00 |
|
|
高嵩
|
b4870471c9
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!103
|
2023-06-14 12:00:17 +08:00 |
|
|
高嵩
|
444f8e1345
|
修改拆分问题
|
2023-06-13 20:12:53 +08:00 |
|
|
gaojiabao
|
d37ae382b5
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-06-13 15:31:55 +08:00 |
|
|
SUNJIABIN
|
aab7a0fb4a
|
优化企标制定顺序号校验
|
2023-06-13 14:15:27 +08:00 |
|
|
gaojiabao
|
f6f6146c83
|
拆分
|
2023-06-13 11:02:21 +08:00 |
|
|
高嵩
|
67106e61f6
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!102
|
2023-06-12 17:50:15 +08:00 |
|
|
SUNJIABIN
|
d24bdd6d28
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-06-12 14:36:10 +08:00 |
|
|
SUNJIABIN
|
efb8e69f02
|
手动全部删除es中的国内外和企标数据，慎用
|
2023-06-12 14:35:58 +08:00 |
|
|
gaojiabao
|
1bd71cc2c4
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-06-12 14:05:02 +08:00 |
|
|
gaojiabao
|
dd3692dd92
|
复审流程发送待办通知定时任务测试接口
|
2023-06-12 14:04:45 +08:00 |
|
|
高嵩
|
b1df47a9b7
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!101
|
2023-06-09 10:10:36 +08:00 |
|
|
SUNJIABIN
|
6325b8ef92
|
将es国内外执行删除的代码解开
|
2023-06-09 09:16:23 +08:00 |
|
|
SUNJIABIN
|
76b1475302
|
优化企标入库时顺序号问题
|
2023-06-08 10:23:05 +08:00 |
|
|
高嵩
|
2a6f73c7ef
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!100
|
2023-06-07 16:38:55 +08:00 |
|