 super_liu
|
2ec4db856a
|
Merge remote-tracking branch 'origin/develop_master_bak' into dev_wxh_bak
|
2021-10-09 14:27:14 +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 |
|
|
zhaokaiyao@91isoft.com
|
3eed899c34
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-27 13:54:24 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ce7812e704
|
把 standtextStatusShow改为了standTextStatusShow
|
2021-09-27 13:54:14 +08:00 |
|
|
super_liu
|
44b33c39d3
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!180
|
2021-09-27 13:43:25 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2556ddcc0b
|
在基础字段中去除了适用产品线和责任工程师 因为在attr中已存在
|
2021-09-27 13:39:43 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
fd2d58c25f
|
添加了连接查询文本状态显示值
|
2021-09-27 10:44:38 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
447d56231a
|
group by中添加字段dicstandNature.DIC_TYPE_NAME
|
2021-09-27 10:33:37 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
50a4b7284a
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-27 10:20:00 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d9d5aeb284
|
标准导出
|
2021-09-27 10:18:26 +08:00 |
|
|
super_liu
|
7c961a92a2
|
feat: There is no way the searchCenter
|
2021-09-27 10:18:26 +08:00 |
|
|
super_liu
|
031cbf9611
|
feat: There is no way the
|
2021-09-27 10:18:26 +08:00 |
|
|
Mr.Z
|
35f49e1528
|
导出排序（按照章节号从小到大）
|
2021-09-27 09:43:27 +08:00 |
|
|
Mr.Z
|
108b718091
|
导出排序（按照章节号从小到大）
|
2021-09-26 17:50:48 +08:00 |
|
|
Mr.Z
|
9b47219f07
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-09-26 17:33:47 +08:00 |
|
|
Mr.Z
|
b064503b3c
|
导出排序（按照章节号从小到大）
|
2021-09-26 17:33:16 +08:00 |
|
|
yanyizhou
|
d2ad6b174c
|
配置管理-机构管理-操作-禁用 点击后 无提示 无效果
|
2021-09-26 14:48:20 +08:00 |
|
|
Mr.Z
|
22027d9e7c
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-09-26 13:48:47 +08:00 |
|