Commit Graph
100 Commits
Author SHA1 Message Date
高嵩 6529b4ed52 修改优化点 2022-11-22 15:55:26 +08:00
高嵩 e1a971fa71 修改优化点 2022-11-22 15:21:27 +08:00
高嵩 e39bc35d79 修改优化点 2022-11-22 14:36:20 +08:00
高嵩 3826c3baff 修改切换英文项目法规清单无数据问题 2022-11-21 13:26:42 +08:00
高嵩 0337a85e84 合并分支 'dev_2nd_period_test' 到 'master'
修改问题知识库搜索null的id问题

查看合并请求 laws-nio/laws-weilai!248
2022-11-11 12:31:48 +08:00
高嵩 9c88a2b615 修改问题知识库搜索null的id问题 2022-11-11 12:31:19 +08:00
高嵩 2e14fec213 合并分支 'dev_2nd_period_test' 到 'master'
首页流程跳转

查看合并请求 laws-nio/laws-weilai!247
2022-11-11 10:46:44 +08:00
高嵩 4c7db3b451 合并分支 'dev_2nd_period_test' 到 'master'
修改问题知识库搜索中心保存知识分享

查看合并请求 laws-nio/laws-weilai!246
2022-11-11 10:34:43 +08:00
高嵩 db04a93b40 修改问题知识库搜索中心保存知识分享 2022-11-11 09:17:59 +08:00
高嵩 dc25039563 合并分支 'dev_2nd_period_test' 到 'master'
修改中英文翻译

查看合并请求 laws-nio/laws-weilai!245
2022-11-10 20:41:27 +08:00
高嵩 88c1cc67ca 合并分支 'dev_2nd_period_test' 到 'master'
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!244
2022-11-10 16:58:33 +08:00
高嵩 8d3c533faf 合并分支 'dev_2nd_period_test' 到 'master'
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!243
2022-11-09 20:31:44 +08:00
高嵩 e8223399ac Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test 2022-11-09 18:06:18 +08:00
高嵩 8f01dc1481 同步数据库 2022-11-09 18:06:09 +08:00
高嵩 3bac043816 合并分支 'dev_third_stage' 到 'master'
修改

查看合并请求 laws-nio/laws-weilai!242
2022-11-08 21:35:24 +08:00
高嵩 7c1012155d 合并分支 'dev_2nd_period_test' 到 'master'
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!241
2022-11-08 20:34:27 +08:00
高嵩 713c935304 合并分支 'dev_third_stage' 到 'master'
修改问题知识库的显示方式

查看合并请求 laws-nio/laws-weilai!240
2022-11-08 20:34:06 +08:00
高嵩 acfea6db37 问题知识库-展示文件-按照创建时间正序排序。 2022-11-07 14:58:44 +08:00
高嵩 f077570f80 待办中心-项目名称展示修改。 2022-11-07 14:48:37 +08:00
高嵩 dbf9de9251 合并分支 'dev_2nd_period_test' 到 'master'
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!239
2022-11-04 19:18:18 +08:00
高嵩 06ef963a48 合并分支 'feature_dev_20221008_TODO' 到 'master'
Feature dev 20221008 todo

查看合并请求 laws-nio/laws-weilai!238
2022-11-04 18:05:02 +08:00
高嵩 b25cff8964 合并分支 'dev_2nd_period_test' 到 'master'
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!237
2022-11-04 18:04:37 +08:00
高嵩 5d9b1951df 修改优化点 2022-11-04 17:56:03 +08:00
高嵩 c21936171c 修改文档拆分详情左侧树的弹框输入框大小 2022-11-04 17:31:50 +08:00
高嵩 07b3db70e2 合并分支 'dev_2nd_period_test' 到 'master'
Dev 2nd period test

查看合并请求 laws-nio/laws-weilai!236
2022-11-04 13:45:47 +08:00
高嵩 9e5753032b 合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period_test'
Feature dev 20221010 extend

查看合并请求 laws-nio/laws-weilai!235
2022-11-04 10:19:03 +08:00
高嵩 09ba8e6f77 合并分支 'feature_dev_20221025_message' 到 'dev_2nd_period_test'
Feature dev 20221025 message

查看合并请求 laws-nio/laws-weilai!234
2022-11-03 15:35:18 +08:00
高嵩 aed6f23880 合并代码 2022-11-03 15:32:47 +08:00
高嵩 18eb5b1710 Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into feature_dev_20221008_TODO 2022-11-03 14:45:22 +08:00
高嵩 dc91107df3 62175问题处理-已发流程中不展示自己的数据 2022-11-03 14:45:05 +08:00
高嵩 0d3afb0fef 合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period_test'
Feature dev 20221010 extend

查看合并请求 laws-nio/laws-weilai!230
2022-11-03 14:32:27 +08:00
高嵩 3f7ad00c1d Merge branch 'dev_2nd_period_test' into 'feature_dev_20221010_extend'
# Conflicts:
#   jero-web/src/common/lang/en-us.js
#   jero-web/src/common/lang/zh-cn.js
2022-11-03 14:32:08 +08:00
高嵩 68170c14bc 合并分支 'feature_dev_20221008_TODO' 到 'dev_2nd_period_test'
Feature dev 20221008 todo

查看合并请求 laws-nio/laws-weilai!229
2022-11-02 09:09:11 +08:00
高嵩 9dfba153e1 合并分支 'feature_dev_20221025_message' 到 'dev_2nd_period_test'
问题知识库--发布发消息

查看合并请求 laws-nio/laws-weilai!228
2022-11-02 09:08:40 +08:00
高嵩 632af0d148 合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period_test'
Feature dev 20221010 extend

查看合并请求 laws-nio/laws-weilai!227
2022-11-02 09:08:16 +08:00
高嵩 cf6a9fa0cd 合并分支 'dev_third_stage' 到 'dev_2nd_period_test'
Dev third stage

查看合并请求 laws-nio/laws-weilai!226
2022-11-02 09:07:54 +08:00
高嵩 1e3a5b585a 修改上传文件名字符限制70变为100 2022-11-01 10:55:17 +08:00
高嵩 b34f623586 合并分支 'feature_dev_20221025_message' 到 'dev_2nd_period_test'
Feature dev 20221025 message

查看合并请求 laws-nio/laws-weilai!225
2022-10-31 15:48:00 +08:00
高嵩 fb87fa3f08 合并分支 'dev_third_stage' 到 'dev_2nd_period_test'
Dev third stage

查看合并请求 laws-nio/laws-weilai!224
2022-10-31 15:47:33 +08:00
高嵩 c1fd7561cc 合并分支 'feature_dev_20221008_TODO' 到 'dev_2nd_period_test'
Feature dev 20221008 todo

查看合并请求 laws-nio/laws-weilai!223
2022-10-31 15:43:16 +08:00
高嵩 8e392b22d9 合并分支 'dev_third_stage' 到 'master'
认证-参数清单-配置名称限制不能重复校验

查看合并请求 laws-nio/laws-weilai!222
2022-10-28 16:37:27 +08:00
高嵩 e3b2fb4313 合并分支 'dev_third_stage' 到 'dev_2nd_period_test'
Dev third stage

查看合并请求 laws-nio/laws-weilai!221
2022-10-28 16:36:24 +08:00
高嵩 d1cc66ebfa 合并分支 'feature_dev_20221025_message' 到 'dev_2nd_period_test'
Feature dev 20221025 message

查看合并请求 laws-nio/laws-weilai!220
2022-10-28 16:35:53 +08:00
高嵩 9aaa654569 合并分支 'feature_dev_20221008_TODO' 到 'dev_2nd_period_test'
Feature dev 20221008 todo

查看合并请求 laws-nio/laws-weilai!219
2022-10-28 16:35:32 +08:00
高嵩 11d88d617f 合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period_test'
Feature dev 20221010 extend

查看合并请求 laws-nio/laws-weilai!218
2022-10-28 16:34:56 +08:00
高嵩 cd6dc3c44a Merge branch 'dev_2nd_period_test' into 'feature_dev_20221010_extend'
# Conflicts:
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
2022-10-28 16:34:39 +08:00
高嵩 c22fd75fbb 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!217
2022-10-28 15:18:52 +08:00
高嵩 f4eb47f707 合并分支 'dev_third_stage' 到 'master'
修改中英文翻译

查看合并请求 laws-nio/laws-weilai!216
2022-10-28 12:16:03 +08:00
高嵩 419e4c9be2 Merge remote-tracking branch 'origin/feature_dev_20221025_message' into dev_2nd_period_test
# Conflicts:
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java
2022-10-28 09:52:04 +08:00
高嵩 a086785f77 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!214
2022-10-27 20:55:47 +08:00
高嵩 c3adfe0e49 Merge remote-tracking branch 'origin/feature_dev_20221010_extend' into dev_2nd_period_test 2022-10-27 15:23:17 +08:00
高嵩 06d6b6d1c7 Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into dev_2nd_period_test 2022-10-27 15:22:49 +08:00
高嵩 8d75dbe38d Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test 2022-10-27 15:22:04 +08:00
高嵩 8fd885a8fa Merge remote-tracking branch 'origin/feature_dev_20221025_message' into dev_2nd_period_test
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_third_record.sql
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/processCenter/components/feedbackInformation.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
2022-10-27 15:21:33 +08:00
高嵩 74c8efc643 合并分支 'dev_third_stage' 到 'dev_2nd_period_test'
Dev third stage

查看合并请求 laws-nio/laws-weilai!212
2022-10-27 15:15:44 +08:00
高嵩 09cb1b2210 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-10-27 14:23:27 +08:00
高嵩 0b13133720 空指针 2022-10-27 14:23:10 +08:00
高嵩 3ba0ae2367 Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into dev_2nd_period_test
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_third_record.sql
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/store/modules/user.js
#	jero-web/src/views/processCenter/components/feedbackInformation.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
2022-10-27 09:49:39 +08:00
高嵩 f9cc564ffc 合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period_test'
Feature dev 20221010 extend

查看合并请求 laws-nio/laws-weilai!210
2022-10-27 09:38:05 +08:00
高嵩 625aa37f3d 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!204
2022-10-25 22:12:01 +08:00
高嵩 0e9f507852 法规意见收集、法规技术评估导出完善。 2022-10-25 16:04:21 +08:00
高嵩 5511ef9f48 合并分支 'dev_third_stage' 到 'master'
修改法规月报的链接字段长度

查看合并请求 laws-nio/laws-weilai!200
2022-10-24 15:49:25 +08:00
高嵩 7db96ce673 合并分支 'dev_third_stage' 到 'master'
修改法规月报的链接字段长度

查看合并请求 laws-nio/laws-weilai!199
2022-10-24 15:04:28 +08:00
高嵩 01603d5f8a 合并代码待办中心 2022-10-24 15:00:19 +08:00
高嵩 d8172ff198 合并分支 'feature_dev_20221010_extend' 到 'dev_2nd_period'
Feature dev 20221010 extend

查看合并请求 laws-nio/laws-weilai!197
2022-10-24 10:10:11 +08:00
高嵩 798a3b5161 Merge branch 'dev_2nd_period' into 'feature_dev_20221010_extend'
# Conflicts:
#   jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
2022-10-24 10:09:49 +08:00
高嵩 25e44bfe7f 合并分支 'dev_third_stage' 到 'dev_2nd_period'
Dev third stage

查看合并请求 laws-nio/laws-weilai!194
2022-10-24 09:23:47 +08:00
高嵩 7403948f94 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!193
2022-10-21 18:04:12 +08:00
高嵩 702ce9c517 同步数据库 2022-10-21 18:03:09 +08:00
高嵩 3adc722289 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!192
2022-10-19 18:04:31 +08:00
高嵩 4656aafd4f Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-10-19 18:02:51 +08:00
高嵩 c02cb4243e 参数项收集清单表头修改 2022-10-19 18:02:31 +08:00
gaosong 4766e21967 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-10-19 14:55:48 +08:00
gaosong ceeeeff41d 修改PDF加密文件的问题 2022-10-19 14:55:37 +08:00
高嵩 a8841655af 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!191
2022-10-17 18:57:55 +08:00
高嵩 0a13b9deaf 修改用户管理搜索部门 2022-10-17 18:57:08 +08:00
高嵩 71f2d1f90b 修改用户管理搜索部门 2022-10-17 18:56:54 +08:00
高嵩 f293bd7fd3 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!190
2022-10-14 17:38:14 +08:00
高嵩 6d2caec19f 修改中英文翻译的后端问题 2022-10-13 11:59:48 +08:00
高嵩 7c724cc5e2 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-10-13 11:58:34 +08:00
高嵩 6147be50b5 参数项清单表格拖拽删除 2022-10-13 11:58:00 +08:00
高嵩 a9c6a37aec 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!188
2022-10-11 20:18:59 +08:00
高嵩 fa999f437b 合并分支 'dev_third_stage' 到 'master'
修改选人组件

查看合并请求 laws-nio/laws-weilai!187
2022-10-11 09:32:06 +08:00
高嵩 0d605ddf93 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!186
2022-10-10 21:07:25 +08:00
高嵩 952d52b765 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-10-10 15:01:24 +08:00
高嵩 2a8f87a697 文档对比-修改对比结果文件预览 2022-10-10 15:01:18 +08:00
高嵩 3e065c74a6 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!185
2022-10-09 20:51:12 +08:00
高嵩 d6070d1804 合并分支 'dev_third_stage' 到 'master'
文档拆分-PDF拆分

查看合并请求 laws-nio/laws-weilai!184
2022-10-07 19:34:34 +08:00
高嵩 2c40b01b9c 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!183
2022-09-30 22:45:04 +08:00
高嵩 7e6a0bd3a1 对外报告-修改选择人员和部门 2022-09-30 21:26:05 +08:00
高嵩 39bdc386ed 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!182
2022-09-30 20:27:11 +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
高嵩 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
高嵩 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
高嵩 7e89210944 合并分支 'temp0927_dev_third' 到 'master'
Temp0927 dev third

查看合并请求 laws-nio/laws-weilai!181
2022-09-28 19:28:34 +08:00
高嵩 e3b48192e2 合并分支 'cd_debug_dev_third' 到 'dev_third_stage'
Cd debug dev third

查看合并请求 laws-nio/laws-weilai!180
2022-09-28 16:31:49 +08:00