FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,049 Commits 1 Branch 0 Tags
29ef5bafe3a2ab0da329344d8e950fe46fadcef8
Commit Graph
1049 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhaokaiyao@91isoft.com 29ef5bafe3 commit temp 2021-10-13 15:39:37 +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
super_liu 08f19231dc Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the

See merge request LiuChao/foton-slrs-system-rest!188
 2021-09-30 18:10:21 +08:00
super_liu 5fc16766d9 feat: There is no way the 2021-09-30 18:09:40 +08:00
super_liu 3388f40099 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!187
 2021-09-30 15:38:45 +08:00
super_liu f093f1f31a Merge branch 'develop_master' into develop_migration 2021-09-30 15:38:07 +08:00
super_liu 0154e41c8f Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!186
 2021-09-30 15:37:42 +08:00
super_liu 13f8ee1feb Merge branch 'develop_master' into develop_migration 2021-09-30 15:37:21 +08:00
super_liu d7cd16a69c feat: There is no way the 2021-09-30 15:36:39 +08:00
super_liu fc2664079d feat: There is no way the 2021-09-29 18:03:32 +08:00
zhaokaiyao@91isoft.com 81c44413fe commit 2021-09-29 11:15:11 +08:00
王夏晖 60060cce55 Merge branch 'develop_master' into 'dev_wangxiahui' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!185
 2021-09-28 18:21:07 +08:00
2510220824 8e8bb38d07 add:增加IDM单点登录及修改服务认证 2021-09-28 18:13:27 +08:00
zhaokaiyao@91isoft.com 13c7c3a3d6 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-28 17:47:11 +08:00
zhaokaiyao@91isoft.com bf3412e488 海外标准导出,去除文本说明 2021-09-28 17:46:23 +08:00
zhaokaiyao@91isoft.com ff4456e3f7 标准拆分-编辑后更改标志未1 2021-09-28 17:19:24 +08:00
super_liu e7ff4862ed Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!182
 2021-09-28 16:53:16 +08:00
zhaokaiyao@91isoft.com d2870231ea 标准拆分-文件类型动态查询 2021-09-28 16:48:48 +08:00
zhaokaiyao@91isoft.com 7e0d3b59b1 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-28 15:18:33 +08:00
Mr.Z aa5e7004dc Merge remote-tracking branch 'origin/develop_master' into develop_1 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
 2021-09-28 10:52:29 +08:00
super_liu 516f32cb43 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!181
 2021-09-28 10:47:16 +08:00
zhaokaiyao@91isoft.com 2c4ff91c4f 部门为"null"的数据不保存 2021-09-28 10:07:29 +08:00
zhaokaiyao@91isoft.com 0a006671cc Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-28 09:04:52 +08:00
zhaokaiyao@91isoft.com 4e2278a987 机构树形排序 2021-09-28 08:58:23 +08:00
zhaokaiyao@91isoft.com f3b8466c5f 同步用户空指针 2021-09-28 08:57:55 +08:00
yuezhihang 87337c1374 查询人 接口 2021-09-27 19:47:15 +08:00
yuezhihang ee340ad056 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-27 19:45:26 +08:00
yanyizhou 58fc669581 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-09-27 17:26:53 +08:00
yanyizhou 4584b06a42 未符合项整改-导出 字段显示有问题 2021-09-27 17:26:48 +08:00
Mr.Z 04a07687c6 标准法规清单查询 2021-09-27 17:11:07 +08:00
Mr.Z 0630c99b0b 添加条款内容传给前端 2021-09-27 16:33:59 +08:00
yanyizhou 21372dbaa4 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-09-27 14:52:53 +08:00
yanyizhou ae1f05c000 标准法规清单-编辑-导出 删除这些字段 2021-09-27 14:52:48 +08:00
zhaokaiyao@91isoft.com 2991806086 联表查询 dicstandTextStatus 2021-09-27 14:05:51 +08:00