Commit Graph
4699 Commits
Author SHA1 Message Date
CD 2f4b8d2279 少个! 2022-10-09 16:55:02 +08:00
CD 3281f86fe4 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-10-09 16:53:00 +08:00
CD 5fb59a9113 对外报告同级新增时加判断 2022-10-09 16:52:28 +08:00
wangzhijiang 2cdeb9787a Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-10-09 15:33:12 +08:00
wangzhijiang 1bacc9ec5e uat问题优化-60796第一条-法规技术评估-导入本地拆解单,条款名称允许为空修改。 2022-10-09 15:32:55 +08:00
CD 5589b8f751 文档对比 代码优化 2022-10-09 15:18:21 +08:00
CD 5f8dab13e6 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-10-09 14:40:59 +08:00
CD b9d529b85d 文档对比 右侧单元格格式bug 2022-10-09 14:40:39 +08:00
zhn af78fd1c2f 整合导出--页眉页脚 2022-10-09 14:33:50 +08:00
CD 79236b57f9 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-10-09 14:17:32 +08:00
CD d44f64535a 文档对比 表格拆分出来 2022-10-09 14:17:10 +08:00
sunFlower 8f63c5a27b 修改禅道已知bug 2022-10-09 14:07:22 +08:00
sunFlower d5d39e4073 修改禅道已知bug 2022-10-09 09:49:31 +08:00
CD b830196641 文档对比创建row时覆盖的问题 2022-10-08 17:21:45 +08:00
CD cfed5d9e61 文档对比导出bug3.0 2022-10-08 16:34:37 +08:00
CD 05aa7f2c5c 文档对比图片bug2.0 2022-10-08 15:14:16 +08:00
CD 222fcb8b4f 对外报告右键点击 2022-10-08 15:00:53 +08:00
CD d944ffae03 文档对比图片bug 2022-10-08 14:43:21 +08:00
CD 747861775f bug60511 2022-10-08 14:38:54 +08:00
CD 0b960424d7 bug 2022-10-08 10:55:01 +08:00
CD 77552722e0 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-10-08 10:19:01 +08:00
CD 75f1e249d0 bug 2022-10-08 10:18:34 +08:00
liyawei d0d400d136 文档拆分-PDF拆分 2022-10-06 23:48:42 +08:00
sunFlower 294f9ea383 修改禅道已知bug 2022-09-30 22:32:56 +08:00
sunFlower 718cf9333a 修改禅道已知bug 2022-09-30 22:15:11 +08:00
CD 41ed6e8d4f Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-09-30 22:01:37 +08:00
CD 872ced7e16 bug 2022-09-30 22:01:18 +08:00
sunFlower 65e64ba258 修改禅道已知bug 2022-09-30 21:38:19 +08:00
高嵩 7e6a0bd3a1 对外报告-修改选择人员和部门 2022-09-30 21:26:05 +08:00
高嵩 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