Commit Graph
4670 Commits
Author SHA1 Message Date
高嵩 a6b56e687b Merge branch 'master' into 'dev_third_stage'
# Conflicts:
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java
2022-09-30 20:26:38 +08:00
gaosong 3320106553 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-09-30 20:05:58 +08:00
gaosong e091c50215 更新sql 2022-09-30 20:05:46 +08:00
CD a6306428b8 文档对比合并单元格类 2022-09-30 19:36:52 +08:00
CD e0ce57461c Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-09-30 18:17:25 +08:00
CD 3d9540399d 文档对比加入图片 2022-09-30 18:16:55 +08:00
sunFlower 325126d55a 修改禅道已知bug 2022-09-30 17:46:55 +08:00
zyx.net 8cfb1b714f Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-09-30 16:49:55 +08:00
zyx.net ae76e266c3 上报库 查看参数说明样式修改 2022-09-30 16:48:57 +08:00
sunFlower 2ea345a190 修改禅道已知bug 2022-09-30 16:28:44 +08:00
sunFlower 65fa2c9ef9 修改禅道已知bug 2022-09-30 16:28:27 +08:00
高嵩 172a87f38e Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-09-30 16:11:54 +08:00
高嵩 867d55793a 菜单管理 表格内容左对齐 2022-09-30 16:11:17 +08:00
wangzhijiang 8045cf1c8c Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-09-30 15:56:53 +08:00
wangzhijiang e0e297081b update 2022-09-30 15:56:20 +08:00
zhn cd1a45a373 搜索中心--全部(添加权重-->编号(10)>标题(8)>文件名称(5)) 2022-09-30 15:15:30 +08:00
zyx.net 4476f645ca Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-09-30 15:08:53 +08:00
zyx.net 96cb1bd2b0 上报库 查看参数说明 2022-09-30 15:07:52 +08:00
zhn d9b86dd5c3 搜索中心-技术领多选 2022-09-30 14:46:37 +08:00
wangzhijiang 8c8b846d3d update 2022-09-30 14:46:28 +08:00
高嵩 cba9081754 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-09-30 14:32:30 +08:00
高嵩 226db2e6c7 对外报告-修改选择人员和部门 2022-09-30 14:32:15 +08:00
sunFlower a7dbe569d2 修改禅道已知bug 2022-09-30 14:16:25 +08:00
sunFlower 00ac7f3c29 修改禅道已知bug 2022-09-30 13:59:47 +08:00
sunFlower ac49267c7f 修改禅道已知bug 2022-09-30 11:53:50 +08:00
sunFlower e9075d72c0 修改禅道已知bug 2022-09-30 11:46:01 +08:00
sunFlower e2a7283514 修改禅道已知bug 2022-09-30 11:45:47 +08:00
zhn bed137ea78 月报导出--设置段前间距和段后间距 2022-09-30 11:15:38 +08:00
sunFlower 21b20a8a87 修改禅道已知bug 2022-09-30 11:04:11 +08:00
zhn 13f3933ca0 月报导出--封面单独占用一页 2022-09-30 10:34:39 +08:00
zhn 672706aeae 月报导出--单元格字体大小 2022-09-29 20:30:05 +08:00
wangzhijiang 945e370ea3 问题知识库-新增、编辑,处理正文插入es时,去除富文本标签。 2022-09-29 18:03:31 +08:00
wangzhijiang af9314bacb 禅道60494 上传文件,上传gif动态图。 2022-09-29 16:09:51 +08:00
sunFlower 0ae590aabf 修改禅道已知bug 2022-09-29 15:41:56 +08:00
sunFlower 1d06758d7e 修改禅道已知bug 2022-09-29 15:39:49 +08:00
wangzhijiang 538dfcb7f5 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-09-29 15:36:55 +08:00
wangzhijiang 69ad8e6b70 update 2022-09-29 15:36:34 +08:00
sunFlower 4820821b40 修改禅道已知bug 2022-09-29 15:33:03 +08:00
wangzhijiang 7eaa05122f Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-09-29 15:05:31 +08:00
wangzhijiang fe1999f7e3 59990 文档翻译下载目标文件名称处理 doc 2022-09-29 15:04:39 +08:00
sunFlower d4f335717e 修改禅道已知bug 2022-09-29 14:53:57 +08:00
wangzhijiang eb03e37432 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-09-29 14:46:06 +08:00
wangzhijiang 48652d3efe 法规技术评估调用查询文档拆分接口,处理数据中带英文单双引号。 2022-09-29 14:45:33 +08:00
sunFlower 5b4c7f8cb0 修改禅道已知bug 2022-09-29 14:43:28 +08:00
sunFlower 71ae922f7b 修改禅道已知bug 2022-09-29 14:27:02 +08:00
sunFlower 4ede260f0e 修改三期优化点 2022-09-29 14:19:50 +08:00
wangzhijiang 3a8d0b43b6 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-09-29 14:16:19 +08:00
wangzhijiang 2aeccf6a0d 法规意见收集、法规技术评估,增加批量手动完成接口。
法规意见收集、法规技术评估,删除时同步删除流程实例相关数据
2022-09-29 14:16:00 +08:00
sunFlower 1a3d0f01ca 修改三期优化点 2022-09-29 14:12:30 +08:00
sunFlower 59e828a166 修改三期优化点 2022-09-29 14:10:45 +08:00