Commit Graph
3479 Commits
Author SHA1 Message Date
高嵩 017ccfdf4b Merge branch 'dev_20230829_change' into 'master'
Dev 20230829 change

See merge request laws-foton-slrs/foton-slrs-system-rest!127
2023-08-29 02:26:42 +00:00
高嵩 8e0237888c Merge branch 'fix_foton_20230613' into 'dev_20230829_change'
Fix foton 20230613

See merge request laws-foton-slrs/foton-slrs-system-rest!126
2023-08-29 02:25:36 +00:00
wxyclub 31f3ce66b6 bug:修改文件下载链接的’/‘ 2023-08-29 10:17:01 +08:00
wxyclub cae8c9c2ac bug:修改文件下载链接的’/‘ 2023-08-28 16:19:04 +08:00
王晓勇 9cecd42b59 Merge branch 'fix_foton_20230613' into 'master'
Fix foton 20230613

See merge request laws-foton-slrs/foton-slrs-system-rest!125
2023-08-22 06:41:27 +00:00
wxyclub b737082196 bug:修改企标顺序号bug 2023-08-18 16:52:19 +08:00
wxyclub 64c4000d4d bug:修改企标顺序号bug 2023-08-16 17:53:00 +08:00
高嵩 98577134f3 Merge branch 'fix_foton_20230613' into 'master'
Fix foton 20230613

See merge request laws-foton-slrs/foton-slrs-system-rest!124
2023-08-14 09:43:23 +00:00
wxyclub 229ca0c73d bug:企标入库后,更新企标计划表修改 2023-08-11 11:36:51 +08:00
wxyclub 1298cab130 Merge branch 'master' into fix_foton_20230613 2023-08-09 16:49:27 +08:00
wxyclub 8b25043d73 bug:企标入库后,更新企标计划表 2023-08-09 16:17:31 +08:00
wxyclub f286b6050b bug:企标编号重复问题处理 2023-08-09 16:13:39 +08:00
wxyclub 9f663904e2 bug:非法字符处理问题 2023-08-08 13:50:25 +08:00
wxyclub e2da9d3eb6 bug:企标编号重复问题处理 2023-08-07 17:53:16 +08:00
wxyclub 84b4c86b36 add:添加企标入库日志,企标编号重复问题处理 2023-08-04 11:20:47 +08:00
高嵩 fd8a51f137 Merge branch 'fix_foton_20230613' into 'master'
Fix foton 20230613

See merge request laws-foton-slrs/foton-slrs-system-rest!122
2023-07-26 03:51:54 +00:00
wxyclub 102c9625d5 add:修改在线编辑存储多条数据问题 2023-07-26 10:03:36 +08:00
wxyclub d60bc2c9da add:添加全量部门同步 2023-07-24 17:18:22 +08:00
wxyclub 41023597d4 add:添加日志输出,修改部门同步请求的参数:时间戳 2023-07-24 11:31:10 +08:00
高嵩 6341100be6 合并分支 'fix_foton_20230613' 到 'master'
add:添加日志输出,修改部门同步请求的参数:时间戳

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!121
2023-07-20 17:56:18 +08:00
wxyclub bce2d3dc56 add:添加日志输出,修改部门同步请求的参数:时间戳 2023-07-20 17:45:41 +08:00
高嵩 9320f2bfc5 合并分支 'fix_foton_20230613' 到 'master'
add:添加日志输出

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!120
2023-07-19 17:53:11 +08:00
wxyclub 1816de99ac add:添加日志输出 2023-07-19 17:52:27 +08:00
高嵩 12da0d3f0e 合并分支 'fix_foton_20230613' 到 'master'
add:添加日志输出

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!119
2023-07-19 17:12:26 +08:00
wxyclub a041daa183 add:添加日志输出 2023-07-19 17:11:02 +08:00
高嵩 3043339cce 合并分支 'fix_foton_20230613' 到 'master'
Fix foton 20230613

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!118
2023-07-14 16:42:21 +08:00
wxyclub 1ab8daa386 add:添加日志输出 2023-07-14 16:21:55 +08:00
gaojiabao cd915554b7 pdf在线编辑区分 2023-07-14 09:54:48 +08:00
gaojiabao a7c56cc8a2 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 2023-07-14 09:52:44 +08:00
gaojiabao 774dcb254d 在线编辑文件必须走在线编辑的pdf转换 2023-07-14 09:32:50 +08:00
高嵩 d0e310992f 合并分支 'fix_foton_20230613' 到 'master'
Fix foton 20230613

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!117
2023-07-10 16:26:23 +08:00
wxyclub e09822233d Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 2023-07-10 15:43:52 +08:00
wxyclub 2d98ed6f3f add:添加定时任务日志打印,修改一条sql 2023-07-10 15:43:30 +08:00
SUNJIABIN 049d497ef5 取消每天00:01国内外和企业标准的被代替标准号的标准 2023-07-10 13:42:31 +08:00
高嵩 a436780725 合并分支 'fix_foton_20230613' 到 'master'
Fix foton 20230613

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!116
2023-07-06 15:57:04 +08:00
gaojiabao 0e2fa19b59 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 2023-07-06 09:59:55 +08:00
gaojiabao 42441795d4 发布稿文件转换 在线编辑与非在线编辑 2023-07-06 09:59:22 +08:00
SUNJIABIN d20f4a4f34 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 2023-07-06 08:58:41 +08:00
SUNJIABIN d971014c09 取消每天00:01国内外和企业标准的被代替标准号的标准 2023-07-06 08:58:23 +08:00
wxyclub 8c677a7715 add:删除多余注释,添加定时任务日志打印 2023-07-05 17:17:49 +08:00
高嵩 5450f65e0d 合并分支 'fix_foton_20230613' 到 'master'
test:测试调用在线编辑文件获取

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!115
2023-07-03 17:00:17 +08:00
wxyclub cc6331f6a6 test:测试调用在线编辑文件获取 2023-07-03 16:55:31 +08:00
高嵩 3e328fefed 合并分支 'fix_foton_20230613' 到 'master'
Fix foton 20230613

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!114
2023-06-29 17:07:58 +08:00
wxyclub d33d1f769a test:测试调用在线编辑文件获取 2023-06-29 17:00:23 +08:00
SUNJIABIN f73bfdf8e2 指定下载文件的编码格式 2023-06-21 15:48:16 +08:00
SUNJIABIN cafa94efbc Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 2023-06-21 15:26:04 +08:00
SUNJIABIN 607eb0fa0c 解决下载文件乱码问题 2023-06-21 15:25:53 +08:00
gaojiabao 0e12cf0ad4 文件地址修改 2023-06-21 15:04:39 +08:00
高嵩 394af4da38 合并分支 'fix_foton_20230613' 到 'master'
Fix foton 20230613

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!113
2023-06-21 11:27:15 +08:00
gaojiabao 83da5397a4 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 2023-06-21 10:59:20 +08:00