FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,081 Commits 1 Branch 0 Tags
ea6e89c2bd3cf7b46c477e4e670294540753ed64
Commit Graph
1081 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王夏晖 ea6e89c2bd Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!205
 2021-10-17 19:58:05 +08:00
zhaokaiyao@91isoft.com 7358e84b82 sql优化,保留标准类别 standSortShow 2021-10-17 19:50:47 +08:00
王夏晖 1aef6454ab Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!204
 2021-10-17 18:44:15 +08:00
zhaokaiyao@91isoft.com dba0c2e86a 附件下载接口加入白名单 2021-10-17 18:43:31 +08:00
zhaokaiyao@91isoft.com b99983e910 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-17 18:41:13 +08:00
zhaokaiyao@91isoft.com b790264f77 导入标准信息excl导出工具 2021-10-17 18:40:53 +08:00
zhaokaiyao@91isoft.com 785ef90acd sql优化 2021-10-17 18:39:57 +08:00
zhaokaiyao@91isoft.com 33254f05f8 模块结构单元,查询 2021-10-17 16:12:23 +08:00
zhaokaiyao@91isoft.com 9b5bf72fad 文件后缀大写 2021-10-17 14:26:44 +08:00
2510220824 a68d9c9e9d add：修改pcms数据下发接口，统一访问前缀 2021-10-16 09:46:26 +08:00
2510220824 89116af8bf Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-10-16 09:34:08 +08:00
2510220824 8b479fca0c add:修改用户获取权限，修改pcms数据同步 2021-10-16 09:33:48 +08:00
super_liu c25f07db08 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!203
 2021-10-15 14:52:44 +08:00
zhaokaiyao@91isoft.com ffa894865c 接口拦截白名单 2021-10-15 14:48:38 +08:00
zhaokaiyao@91isoft.com 8ef4f22e24 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-14 17:11:29 +08:00
zhaokaiyao@91isoft.com fec7245ec1 添加导出为excl 接口进白名单 2021-10-14 17:11:15 +08:00
super_liu aa614a27cf Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the add white list

See merge request LiuChao/foton-slrs-system-rest!202
 2021-10-14 16:27:59 +08:00
super_liu 042e6d12a5 Merge branch 'develop_master' into develop_migration 
# Conflicts:
#	adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
 2021-10-14 16:27:22 +08:00
super_liu 28391e6cc2 feat: There is no way the add white list 2021-10-14 16:18:51 +08:00
王夏晖 f6836b0615 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!201
 2021-10-14 15:14:10 +08:00
zhaokaiyao@91isoft.com f1ef403e56 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-14 15:11:16 +08:00
zhaokaiyao@91isoft.com 4e66ba832f 取消定时同步,手动同步加入白名单 2021-10-14 15:11:06 +08:00
王夏晖 5cd66b338c Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!200
 2021-10-14 14:43:20 +08:00
zhaokaiyao@91isoft.com 2caec798ad Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-14 14:41:07 +08:00
zhaokaiyao@91isoft.com b33d2da29d 定时用户同步,和组织机构同步 2021-10-14 14:40:54 +08:00
yuezhihang 371f0cbfe8 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-10-14 09:17:17 +08:00
yuezhihang 6d63592507 清单内容 2021-10-14 09:17:07 +08:00
super_liu b42992bbe2 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!199
 2021-10-13 15:55:22 +08:00
zhaokaiyao@91isoft.com 38ad74e9ee Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-13 15:49:52 +08:00
zhaokaiyao@91isoft.com 29ef5bafe3 commit temp 2021-10-13 15:39:37 +08:00
2510220824 b47e30c9ee Merge remote-tracking branch 'origin/develop_master' into develop_master 
# Conflicts:
#	adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
 2021-10-13 15:36:54 +08:00
2510220824 3fcd7e90f6 add:增加数据下发白名单 2021-10-13 15:35:05 +08:00
super_liu 127fb21929 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!198
 2021-10-13 15:04:44 +08:00
zhaokaiyao@91isoft.com a2866cf07e Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-10-13 14:59:12 +08:00
zhaokaiyao@91isoft.com 503523115b 国内外标准->详情->关联模块 2021-10-13 14:48:02 +08:00
super_liu 7f39fa2447 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the

See merge request LiuChao/foton-slrs-system-rest!196
 2021-10-12 17:06:15 +08:00
super_liu 5506e06a64 feat: There is no way the 2021-10-12 17:05:29 +08:00
super_liu 4d6c48a85e Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the

See merge request LiuChao/foton-slrs-system-rest!195
 2021-10-12 13:37:29 +08:00
super_liu 08a68ced24 feat: There is no way the 2021-10-12 13:36:04 +08:00
super_liu fda8290ca2 Merge branch 'develop_master_bak' into 'develop_master' 
Develop master bak

See merge request LiuChao/foton-slrs-system-rest!194
 2021-10-11 18:09:36 +08:00
super_liu c7f6a38694 feat: There is no way the idm and oa 2021-10-11 18:05:55 +08:00
super_liu cf41791d0c feat: There is no way the idm and oa 2021-10-11 18:03:50 +08:00
super_liu 3c3a199a1a feat: There is no way the idm and oa 2021-10-11 17:45:30 +08:00
王夏晖 9d36b3fa21 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request LiuChao/foton-slrs-system-rest!193
 2021-10-11 14:32:12 +08:00
Mr.Z a15d20a8be 标准合规评估结果小眼睛查询章节号排序(新增需求根据项目名称排序) 2021-10-09 14:49:28 +08:00
super_liu 2ec4db856a Merge remote-tracking branch 'origin/develop_master_bak' into dev_wxh_bak 2021-10-09 14:27:14 +08:00
Mr.Z bcc12aeb95 标准合规评估结果小眼睛查询章节号排序初改 2021-10-09 09:31:16 +08:00
zhaokaiyao@91isoft.com 36df1dc472 修改实体类属性类型 2021-10-08 14:53:28 +08:00
zhaokaiyao@91isoft.com b4ab5a8f43 comment 2021-10-08 14:52:46 +08:00
张宇欢 4def3bfe68 Merge branch 'develop_1' into 'develop_master' 
zzzDevelop 1

See merge request LiuChao/foton-slrs-system-rest!189
 2021-10-08 09:30:19 +08:00