Commit Graph
2818 Commits
Author SHA1 Message Date
高嵩 b43cc4a60f Merge branch 'feature_dev_20230105_ZDYBT'
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/projectManagement/components/customizeList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
2023-02-11 22:10:12 +08:00
高嵩 666bcc10ff 撤销 "Merge branch 'feature_20221014_noLogo' into 'master'"
这将还原提交 0fc81dd9fa
2023-02-03 15:19:11 +08:00
高嵩 0fc81dd9fa Merge branch 'feature_20221014_noLogo' into 'master'
# Conflicts:
#   jero-web/src/views/projectManagement/components/TaskList.vue
2023-02-03 10:30:13 +08:00
高嵩 ff127719c5 合并分支 'fix_2nd_20230103' 到 'master'
Fix 2nd 20230103

查看合并请求 laws-nio/laws-weilai!279
2023-01-13 17:23:59 +08:00
zhn 421aa6778b 项目库列表查询 2023-01-13 14:07:30 +08:00
高嵩 770bd8a418 更新sql 2023-01-13 08:59:56 +08:00
高嵩 da302e52f8 Merge remote-tracking branch 'origin/fix_2nd_20230103'
# Conflicts:
#	jero-web/src/views/projectManagement/components/listAddModel.vue
2023-01-12 21:09:27 +08:00
zhn 9ae3fdcdd0 法规清单,虚拟清单高级搜索--适用地区修改 2023-01-12 16:40:29 +08:00
zhn 77ff0f32d8 项目库置顶sql 2023-01-12 15:02:15 +08:00
zhn 5bd89aa63e 项目库--置顶修改 2023-01-12 14:59:11 +08:00
zhn 653da23e05 文档库--适用地区搜索 2023-01-11 15:10:32 +08:00
高嵩 5dc21849c2 合并分支 'fix_2nd_20230103' 到 'master'
Fix 2nd 20230103

查看合并请求 laws-nio/laws-weilai!276
2023-01-09 21:41:25 +08:00
zhn dca48af888 文档动态--上传文件 2023-01-09 17:04:47 +08:00
zhn 0ca43fa19e 自定义列表表头 2023-01-09 11:55:09 +08:00
zhn dba8529941 自定义表头 2023-01-09 11:49:46 +08:00
zhn 75df08798e 自定义列表 2023-01-09 11:42:51 +08:00
zhn 9854157768 自定义表头 2023-01-09 11:10:05 +08:00
zhn 7fbbc9c522 自定义表头 2023-01-09 09:58:16 +08:00
zhn 14ab5b1877 自定义表头 2023-01-09 09:38:38 +08:00
zhn 91a3c16956 自定义表头参数接收 2023-01-09 09:18:37 +08:00
高嵩 6ce825174a 合并分支 'fix_2nd_20230103' 到 'master'
Fix 2nd 20230103

查看合并请求 laws-nio/laws-weilai!273
2023-01-07 08:18:38 +08:00
wangzhijiang be3d6a9f00 Merge remote-tracking branch 'origin/fix_2nd_20230103' into fix_2nd_20230103 2023-01-06 17:10:06 +08:00
wangzhijiang b24ed1a7ac 参数项收集清单-列表查询高级查询。 2023-01-06 17:09:50 +08:00
zhn ba7d0e9a08 自定义表头 2023-01-06 16:58:00 +08:00
高嵩 491dd13e4d 处理导出参数清单空指针问题。 2023-01-06 16:56:21 +08:00
高嵩 3643370ec1 处理导出参数清单空指针问题。 2023-01-06 16:54:51 +08:00
zhn 557fec17fd 自定义表头 2023-01-06 14:55:59 +08:00
wangzhijiang 034c7ab2eb 参数收集、参数模板管理、上报库管理,检索编号问题处理。 2023-01-03 18:04:37 +08:00
高嵩 45ce6c2a1e 合并分支 'fix_2nd_period' 到 'master'
Fix 2nd period

查看合并请求 laws-nio/laws-weilai!272
2023-01-03 13:57:52 +08:00
wangzhijiang 1e911f50ff 知识分享-联系创建人-获取用户飞书信息接口修改。 2023-01-03 13:52:28 +08:00
wangzhijiang cdc327755c Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2023-01-03 11:46:34 +08:00
wangzhijiang b438729c55 编辑文档拆分详情-设置自动排序。 2023-01-03 11:46:10 +08:00
zhn f49464d694 法规月报修改 2023-01-03 11:05:01 +08:00
wangzhijiang e3273a8765 update 2022-12-30 18:32:12 +08:00
wangzhijiang f03ef8f9a8 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 18:19:03 +08:00
wangzhijiang 5437d55fab 64614 参数项收集清单--导出--参考列未正常回显 2022-12-30 18:18:41 +08:00
zhn de33009941 法规月报导出 2022-12-30 18:10:16 +08:00
wangzhijiang cae323e674 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 17:47:26 +08:00
wangzhijiang 0fa7d983d9 64616 认证参数收集--认证工程师、工程接口人--导出 参考列上传的附件未正常回显 2022-12-30 17:47:03 +08:00
CD eed32438fd 权限同步接口加log日志 2022-12-30 16:32:25 +08:00
CD 4870e782a8 加上@transactional注解 2022-12-30 16:16:52 +08:00
CD f7cae9babc Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 15:42:53 +08:00
CD b167ee2878 把直接返回注掉,防止他查不出viewer 2022-12-30 15:41:41 +08:00
高嵩 07c02abef6 同步上产数据库结构 2022-12-30 15:36:04 +08:00
CD 0debb90188 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 14:31:45 +08:00
CD adc4d1ab0c 项目状态看板根据权限筛选 2022-12-30 14:31:18 +08:00
zhn 1728d53f1b Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 14:10:50 +08:00
zhn b7dd8125cd 未符合项列表--相关项目名称修改 2022-12-30 14:10:26 +08:00
wangzhijiang 5a4c375ed4 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 14:08:43 +08:00
wangzhijiang b897423f8f 文档拆分-拆分已入库文本功能,设置默认展示顺序。 2022-12-30 14:07:50 +08:00