高嵩
|
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 |
|
高嵩
|
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 |
|
高嵩
|
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 |
|
高嵩
|
c30355e360
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!159
|
2022-08-25 23:47:47 +08:00 |
|
高嵩
|
99b578fbf4
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!158
|
2022-08-25 23:46:45 +08:00 |
|
高嵩
|
7378b41e84
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!157
|
2022-08-25 23:46:13 +08:00 |
|
gaosong
|
e9a74c4025
|
修改法规清单-导入检查重复编号问题
|
2022-08-23 02:08:33 +08:00 |
|
gaosong
|
3e6213ee94
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-08-23 01:57:06 +08:00 |
|
gaosong
|
e91af998ec
|
修改文档对比-导出格式
|
2022-08-23 01:56:47 +08:00 |
|
gaosong
|
7a19582e87
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-08-18 09:41:46 +08:00 |
|
gaosong
|
31b35bf978
|
修改对外报告-时间查询
|
2022-08-18 09:41:31 +08:00 |
|
gaosong
|
3cd2311e9a
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-08-15 15:41:48 +08:00 |
|
gaosong
|
c1545afb0d
|
修改文档对比-修改fileId
|
2022-08-15 15:41:39 +08:00 |
|
gaosong
|
4fa6af8d3f
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-08-15 14:01:23 +08:00 |
|
gaosong
|
cffa714da5
|
修改文档对比-修改排序和模糊搜索
|
2022-08-15 14:01:15 +08:00 |
|
gaosong
|
6d56a3e16d
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-08-15 13:34:25 +08:00 |
|
gaosong
|
994037a5a4
|
修改文档对比-修改排序和模糊搜索
|
2022-08-15 12:32:59 +08:00 |
|
gaosong
|
959786f4c9
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-08-11 17:59:25 +08:00 |
|
gaosong
|
2b07cde0e4
|
修改文档对比-修改导出评论问题
|
2022-08-11 17:59:18 +08:00 |
|
gaosong
|
11ebf9b3b9
|
修改文档对比-修改对比结果显示链接
|
2022-08-11 14:38:24 +08:00 |
|
gaosong
|
a6c283dde0
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-08-11 14:32:36 +08:00 |
|
gaosong
|
1c7c779a7f
|
修改文档对比-修改查询结果包含没有传回文档库的数据
|
2022-08-11 14:32:25 +08:00 |
|
gaosong
|
ae730f82ed
|
修改文档对比-修改发布信息显示问题
|
2022-08-11 11:25:58 +08:00 |
|
gaosong
|
a4090ece41
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-08-11 11:12:05 +08:00 |
|
gaosong
|
85f9b05a36
|
修改文档对比-修改信息跳转链接
|
2022-08-11 11:11:47 +08:00 |
|
gaosong
|
742c824672
|
修改对外报告-修改sql
|
2022-08-11 10:36:27 +08:00 |
|
gaosong
|
f795b44a4b
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-08-11 10:24:08 +08:00 |
|
gaosong
|
88ff2361ad
|
修改对外报告-修改创建文件夹问题
|
2022-08-11 10:23:55 +08:00 |
|
gaosong
|
9cb0b88fcd
|
修改对外报告-修改文件夹权限显示问题
|
2022-08-11 00:22:11 +08:00 |
|
gaosong
|
7fcbd82de1
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-08-10 23:32:27 +08:00 |
|
gaosong
|
862120ce1b
|
修改对外报告-修改最后一个一级文件夹不能删
|
2022-08-10 23:32:06 +08:00 |
|
gaosong
|
8b098d7cc2
|
修改对外报告-修改删除权限问题
|
2022-08-10 17:53:20 +08:00 |
|