 高嵩
|
9c88a2b615
|
修改问题知识库搜索null的id问题
|
2022-11-11 12:31:19 +08:00 |
|
|
高嵩
|
db04a93b40
|
修改问题知识库搜索中心保存知识分享
|
2022-11-11 09:17:59 +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 |
|
|
高嵩
|
acfea6db37
|
问题知识库-展示文件-按照创建时间正序排序。
|
2022-11-07 14:58:44 +08:00 |
|
|
高嵩
|
f077570f80
|
待办中心-项目名称展示修改。
|
2022-11-07 14:48:37 +08:00 |
|
|
高嵩
|
5d9b1951df
|
修改优化点
|
2022-11-04 17:56:03 +08:00 |
|
|
高嵩
|
c21936171c
|
修改文档拆分详情左侧树的弹框输入框大小
|
2022-11-04 17:31:50 +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 |
|
|
高嵩
|
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 |
|
|
高嵩
|
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 |
|
|
高嵩
|
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 |
|
|
高嵩
|
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 |
|
|
高嵩
|
0e9f507852
|
法规意见收集、法规技术评估导出完善。
|
2022-10-25 16:04:21 +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 |
|
|
高嵩
|
702ce9c517
|
同步数据库
|
2022-10-21 18:03:09 +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 |
|
|
高嵩
|
0a13b9deaf
|
修改用户管理搜索部门
|
2022-10-17 18:57:08 +08:00 |
|
|
高嵩
|
71f2d1f90b
|
修改用户管理搜索部门
|
2022-10-17 18:56:54 +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 |
|
|
高嵩
|
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 |
|
|
高嵩
|
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 |
|
|
高嵩
|
d820712eff
|
合并分支 'temp0927_dev_third' 到 'master'
修改流程
查看合并请求 laws-nio/laws-weilai!179
|
2022-09-27 18:11:19 +08:00 |
|
|
高嵩
|
f158dae72d
|
参数收集清单 参数名称超行省略 编号 参数名称固定列
|
2022-09-26 17:45:29 +08:00 |
|
|
高嵩
|
e6f6b19362
|
修改法规清单的备注和参数的编号名称限制字符
|
2022-09-23 16:54:15 +08:00 |
|
|
高嵩
|
b8467a9225
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!177
|
2022-09-23 15:00:33 +08:00 |
|
|
高嵩
|
ac80775521
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-09-23 14:51:35 +08:00 |
|
|
高嵩
|
bcae7f63af
|
修改法规清单的备注和参数的编号名称限制字符
|
2022-09-23 14:50:59 +08:00 |
|
|
gaosong
|
1c3c1595a3
|
修改bug-虚拟清单导入数组越界问题
|
2022-09-21 21:13:53 +08:00 |
|
|
高嵩
|
e9ca89ec6d
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!176
|
2022-09-19 18:48:10 +08:00 |
|
|
高嵩
|
54e2b74bc2
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!175
|
2022-09-15 20:34:19 +08:00 |
|
|
高嵩
|
443713862c
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!173
|
2022-09-09 20:27:47 +08:00 |
|
|
gaosong
|
2872feb45c
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-09-09 20:27:08 +08:00 |
|
|
gaosong
|
894d6b0d9d
|
同步数据库文档
|
2022-09-09 20:26:59 +08:00 |
|
|
高嵩
|
073d342e97
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!172
|
2022-09-09 17:55:04 +08:00 |
|
|
高嵩
|
1044f6f81c
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!171
|
2022-09-09 11:51:46 +08:00 |
|
|
高嵩
|
415e2064eb
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!169
|
2022-09-08 20:43:05 +08:00 |
|
|
gaosong
|
a84234788e
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-09-08 20:42:18 +08:00 |
|
|
gaosong
|
89f33e0b1c
|
修改文档对比-条目对比高亮
|
2022-09-08 20:42:04 +08:00 |
|
|
高嵩
|
ab8bd4f99a
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!168
|
2022-09-08 20:29:52 +08:00 |
|
|
高嵩
|
de740057da
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!167
|
2022-09-07 20:34:55 +08:00 |
|
|
gaosong
|
fbf68a9fa7
|
修改文档对比-条目对比高亮
|
2022-09-07 20:04:24 +08:00 |
|
|
gaosong
|
56b92a9568
|
修改文档对比-条目对比高亮
|
2022-09-07 19:19:46 +08:00 |
|
|
高嵩
|
88051d0000
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!166
|
2022-09-07 18:58:48 +08:00 |
|
|
gaosong
|
540cb223d7
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-09-07 18:55:27 +08:00 |
|
|
gaosong
|
d59ebd0f2c
|
修改文档对比-条目对比高亮
|
2022-09-07 18:55:17 +08:00 |
|
|
gaosong
|
d99ddf5b86
|
修改文档对比-数据显示问题
|
2022-09-07 17:39:01 +08:00 |
|
|
gaosong
|
105a6edad8
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-09-07 17:14:44 +08:00 |
|
|
gaosong
|
ef87fa9ec3
|
修改对外报告-编辑数据带入0秒问题
|
2022-09-07 17:14:35 +08:00 |
|
|
gaosong
|
9e8e62bbe3
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-09-07 15:01:12 +08:00 |
|
|
gaosong
|
bea743190e
|
修改上报库-查看 上间距
|
2022-09-07 14:54:42 +08:00 |
|
|
高嵩
|
0cda51dddc
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!165
|
2022-09-06 19:48:48 +08:00 |
|
|
高嵩
|
133e3435f5
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!164
|
2022-09-05 19:25:02 +08:00 |
|
|
高嵩
|
e984eed24e
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!163
|
2022-09-05 11:21:01 +08:00 |
|
|
gaosong
|
21cea76448
|
修改对外报告-时间显示去掉时分秒
|
2022-08-31 22:04:13 +08:00 |
|
|
gaosong
|
c67e05ef3e
|
修改文档对比-菜单问题
|
2022-08-26 00:26:15 +08:00 |
|