 肖文钰
|
5d45d9aa9d
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!90
|
2022-07-15 22:08:07 +08:00 |
|
|
liyawei
|
0640a5a102
|
people-同步用户bug修改
|
2022-07-15 18:37:13 +08:00 |
|
|
liyawei
|
04af7768ea
|
people-同步用户bug修改
|
2022-07-15 17:36:24 +08:00 |
|
|
肖文钰
|
2450ea011a
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!86
|
2022-07-14 20:15:04 +08:00 |
|
|
liyawei
|
4b68f8ddf3
|
people-用户同步bug修改
|
2022-07-14 18:58:06 +08:00 |
|
|
liyawei
|
dccc534f74
|
people-用户同步bug修改
|
2022-07-14 18:27:01 +08:00 |
|
|
李雪涛
|
128c501e19
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!78
|
2022-07-12 15:19:56 +08:00 |
|
|
wangzhijiang
|
d49a86e28b
|
查询评估方式数据字典接口、插入评估方式相关数据sql
|
2022-07-12 14:48:59 +08:00 |
|
|
zhn
|
061ef75f2a
|
消息--添加发起人字段
|
2022-07-11 11:21:35 +08:00 |
|
|
zer0Black
|
f7b8c67039
|
单独启动http和https
|
2022-07-09 17:38:21 +08:00 |
|
|
zer0Black
|
8b05a19cb6
|
处理端口配置反了的问题
|
2022-07-09 15:48:02 +08:00 |
|
|
wangzhijiang
|
97e87ebada
|
本地启动 注释配置https ssl证书 部署时放开即可。
|
2022-07-08 16:28:24 +08:00 |
|
|
wangzhijiang
|
66e3aa5b21
|
配置https .JKS的SSL证书。
|
2022-07-08 15:52:07 +08:00 |
|
|
liyawei
|
deb243daf9
|
认证-上报库-导出历史
|
2022-07-04 15:44:49 +08:00 |
|
|
wangzhijiang
|
eee6db760d
|
法规清单-选择角色中英文切换。
|
2022-07-01 19:16:49 +08:00 |
|
|
zer0Black
|
a696406651
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
# jero-web/src/common/lang/en-us.js
# jero-web/src/common/lang/zh-cn.js
# jero-web/src/components/uploadFileChangeDown/file.vue
|
2022-07-01 15:12:31 +08:00 |
|
|
zhn
|
f0b7a5c054
|
pdf下载添加水印
|
2022-06-30 15:36:31 +08:00 |
|
|
zer0Black
|
e679550a6f
|
按照责任领域的名称进行了正向排序
|
2022-06-30 14:58:40 +08:00 |
|
|
liyawei
|
cc246e52ee
|
people同步用户bug
|
2022-06-22 16:21:37 +08:00 |
|
|
liyawei
|
65c93bb63b
|
上报库-参数到处模板-附件上传
|
2022-06-22 11:24:19 +08:00 |
|
|
zer0Black
|
4682901bb6
|
设置创建人处理查询人的数据
|
2022-06-18 16:18:13 +08:00 |
|
|
xiejunyu
|
e60c7dde8d
|
标签内容修改
|
2022-06-17 12:06:59 +08:00 |
|
|
liyawei
|
623d81938d
|
处理同步过来的用户数据id不同，username相同,违背用户名单一索引的情况
|
2022-06-16 09:48:17 +08:00 |
|
|
liyawei
|
d402630925
|
opensso登录-获取用户角色信息
|
2022-06-16 09:46:46 +08:00 |
|
|
liyawei
|
13b0773a3a
|
认证-参数模板-英文导入
|
2022-06-15 18:00:38 +08:00 |
|
|
wangchengjun
|
90403f17b6
|
处理文件流关闭问题
|
2022-06-15 16:29:49 +08:00 |
|
|
wangzhijiang
|
7cdd670fde
|
Merge remote-tracking branch 'origin/master'
|
2022-06-15 10:57:21 +08:00 |
|
|
wangzhijiang
|
a81a2cef78
|
登录-获取用户角色信息
|
2022-06-15 10:57:02 +08:00 |
|
|
liyawei
|
9e7a80ef1d
|
同步用户bug修改
|
2022-06-15 10:02:48 +08:00 |
|
|
zhn
|
693a9af875
|
判空
|
2022-06-14 23:49:04 +08:00 |
|
|
qq787203167
|
c3795dfbfe
|
角色切换
|
2022-06-14 19:21:32 +08:00 |
|
|
zhn
|
a6ba8df1e2
|
角色切换
|
2022-06-14 18:28:50 +08:00 |
|
|
xiejunyu
|
9cf100c790
|
bug54017相关人员责任领域展示顺序修改
|
2022-06-14 11:19:10 +08:00 |
|
|
zer0Black
|
eac4512cf6
|
处理各位因为类型强制转换为空校验导致的问题
|
2022-06-11 20:43:03 +08:00 |
|
|
zer0Black
|
55acd6c0da
|
分类字典的查询修改
补充蔚来标准的sql
|
2022-06-11 13:40:52 +08:00 |
|
|
zer0Black
|
4a81fc66bd
|
分类字段返回的bug
|
2022-06-11 13:31:50 +08:00 |
|
|
liyawei
|
c93ab796b3
|
拆分-图片-取消base64编码解决中文乱码问题
|
2022-06-10 16:43:03 +08:00 |
|
|
zhn
|
d09e7e3481
|
Merge remote-tracking branch 'origin/master'
|
2022-06-10 15:23:44 +08:00 |
|
|
zhn
|
7f58ded5d4
|
文件上传
|
2022-06-10 15:20:12 +08:00 |
|
|
xiejunyu
|
26d666603c
|
相关人员bug修改
|
2022-06-10 14:48:57 +08:00 |
|
|
liyawei
|
b8e0ee3a11
|
ocr,拆分文件切换cos
|
2022-06-10 12:17:29 +08:00 |
|
|
liyawei
|
8185b9af62
|
ocr,拆分文件切换cos
|
2022-06-10 09:42:56 +08:00 |
|
|
liyawei
|
88e43ba8b0
|
people同步用户-添加默认工程师角色
|
2022-06-09 19:04:59 +08:00 |
|
|
liyawei
|
e62fe65ab7
|
Merge remote-tracking branch 'origin/master'
|
2022-06-09 18:01:34 +08:00 |
|
|
zhn
|
5978500d01
|
word,excel预览
|
2022-06-09 18:01:19 +08:00 |
|
|
liyawei
|
6bae4ddf71
|
sso修改
|
2022-06-09 17:38:07 +08:00 |
|
|
zhn
|
3de6b0f4a3
|
pdf预览
|
2022-06-09 17:35:37 +08:00 |
|
|
zhn
|
722817b5c4
|
文件修改
|
2022-06-09 15:52:56 +08:00 |
|
|
xiejunyu
|
ef37e16d76
|
标签排序修改
|
2022-06-09 11:10:39 +08:00 |
|
|
xiejunyu
|
443608c4c8
|
标签排序修改
|
2022-06-09 11:10:39 +08:00 |
|