 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 |
|
|
yanyizhou
|
30c2b5de44
|
配置管理-机构管理 输入检索条件 查询 有12条 但是显示25条 25条是所有的数据数
|
2021-09-26 10:34:07 +08:00 |
|
|
super_liu
|
ddaf6d7d2b
|
Merge branch 'develop_migration' into 'develop_master'
Develop migration
See merge request LiuChao/foton-slrs-system-rest!179
|
2021-09-23 15:38:58 +08:00 |
|
|
super_liu
|
e3780efdf5
|
Merge branch 'develop_master' into develop_migration
|
2021-09-23 15:31:01 +08:00 |
|
|
super_liu
|
898f510868
|
feat: There is no way the searchCenter
|
2021-09-23 15:29:02 +08:00 |
|
|
yanyizhou
|
c7e3c97339
|
国内外标准--如果清单下挂着标准A，在标准库里删除标准A的话，加个验证 不让删这个标准
|
2021-09-23 15:17:41 +08:00 |
|
|
Mr.Z
|
8e2d3c7697
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-09-23 14:00:35 +08:00 |
|
|
yanyizhou
|
8dd5ed9230
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-09-23 09:15:42 +08:00 |
|
|
王夏晖
|
215653505b
|
Merge branch 'develop_3' into 'develop_master'
分解单->关联条款
See merge request LiuChao/foton-slrs-system-rest!178
|
2021-09-23 08:36:52 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
5d1e39fa32
|
分解单->关联条款
|
2021-09-23 01:12:51 +08:00 |
|
|
super_liu
|
52f49021bd
|
Merge branch 'develop_migration' into 'develop_master'
Develop migration
See merge request LiuChao/foton-slrs-system-rest!177
|
2021-09-22 17:35:51 +08:00 |
|
|
super_liu
|
179ecebd76
|
Merge branch 'develop_master' into develop_migration
|
2021-09-22 17:34:01 +08:00 |
|
|
super_liu
|
86555259a0
|
feat: There is no way the
|
2021-09-22 17:30:37 +08:00 |
|
|
Mr.Z
|
2b9b039a48
|
拉取master
|
2021-09-22 16:52:13 +08:00 |
|
|
Mr.Z
|
8c749b2f84
|
拉取master
|
2021-09-22 16:51:02 +08:00 |
|
|
super_liu
|
90f025fc03
|
Merge branch 'develop_3' into 'develop_master'
标准详情->分解单->排序split_pid函数
See merge request LiuChao/foton-slrs-system-rest!176
|
2021-09-22 16:32:35 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d4a293cbef
|
标准详情->分解单->排序split_pid函数
|
2021-09-22 16:26:02 +08:00 |
|
|
Mr.Z
|
e777d18044
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-09-22 09:45:04 +08:00 |
|
|
yanyizhou
|
bbfcbae5a0
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-09-17 09:42:15 +08:00 |
|
|
yanyizhou
|
de61789265
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-09-17 09:40:27 +08:00 |
|
|
super_liu
|
0ccbc5cacf
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!175
|
2021-09-17 09:34:59 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
76b61d5d07
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-17 09:32:25 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
7bc2d8124a
|
首页->标准发布->实施日期和发布日期比较时的日期格式
|
2021-09-17 09:31:52 +08:00 |
|
|
Mr.Z
|
e8d901bb2f
|
分解单搜索问题~
|
2021-09-16 20:11:23 +08:00 |
|
|
yuezhihang
|
07a5ca6fc2
|
Merge remote-tracking branch 'origin/develop_3' into develop_master
|
2021-09-16 20:06:40 +08:00 |
|
|
yuezhihang
|
69d5a15ce4
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-09-16 20:06:03 +08:00 |
|
|
yuezhihang
|
4d598a76a2
|
标准解读 章节1 展示
|
2021-09-16 20:05:48 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
e7e3848108
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-16 20:04:09 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
fe0a0f7dbe
|
国内外标准 实施日期排序 程序异常 group by问题
|
2021-09-16 20:03:40 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ccf7d32945
|
首页标准发布 只查询文本状态为即将实施的数据
|
2021-09-16 19:27:36 +08:00 |
|
|
super_liu
|
66faec58e0
|
Merge branch 'develop_migration' into 'develop_master'
Develop migration
See merge request LiuChao/foton-slrs-system-rest!174
|
2021-09-16 17:15:52 +08:00 |
|
|
super_liu
|
2878ca491a
|
feat: There is no way the
|
2021-09-16 17:14:33 +08:00 |
|