Commit Graph
978 Commits
Author SHA1 Message Date
zhaokaiyao@91isoft.com 4e2278a987 机构树形排序 2021-09-28 08:58:23 +08:00
zhaokaiyao@91isoft.com f3b8466c5f 同步用户空指针 2021-09-28 08:57:55 +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
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
王夏晖 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
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
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
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
zhaokaiyao@91isoft.com 3eb2ddce1e 分解单默认升序排序 2021-09-16 16:47:03 +08:00
super_liu 881055c810 Merge branch 'develop_master' into develop_migration 2021-09-16 15:02:39 +08:00
yuezhihang 9e392bf904 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-16 15:00:23 +08:00
yuezhihang 6e88f37c28 项目评估流程排序问题 2021-09-16 15:00:14 +08:00
super_liu 97ebfb6f6a feat: There is no way the 2021-09-16 14:56:39 +08:00
zhaokaiyao@91isoft.com 44ba80e050 解决了标准预警,条款预警标准号显示为null的问题 2021-09-16 10:48:19 +08:00
super_liu e195fbc416 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!173
2021-09-16 09:15:15 +08:00
yuezhihang d5081e56f7 Merge remote-tracking branch 'origin/develop_3' into develop_master 2021-09-16 09:13:34 +08:00
zhaokaiyao@91isoft.com dcc461e041 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-16 09:11:51 +08:00
zhaokaiyao@91isoft.com d6331ab155 标准详情,已被分解的的文本才有分解单按钮 2021-09-15 18:01:06 +08:00
zhaokaiyao@91isoft.com 180b755bec 分解单排序 2021-09-15 17:07:37 +08:00
yuezhihang bcf47c93e1 查人组件 2021-09-15 16:34:47 +08:00
Mr.Z ba7dd33176 未符合项整改库标准号/标准名称搜索~ 2021-09-14 17:40:11 +08:00
super_liu b3e70132bd Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!172
2021-09-14 15:43:29 +08:00
zhaokaiyao@91isoft.com 93fed98d3e Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-14 15:42:43 +08:00
zhaokaiyao@91isoft.com 33d084527b 导入文件路径 摒弃配置 2021-09-14 15:42:35 +08:00
super_liu 6d39c32956 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!171
2021-09-14 15:13:09 +08:00