FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,162 Commits 1 Branch 0 Tags
a76a135e880792b9807ea97f2f3a905ec3f7e581
Commit Graph
1162 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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