FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
900 Commits 1 Branch 0 Tags
bbbf1010554ec06e7dc648cc1d76075a3512d0b1
Commit Graph
900 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yuezhihang bbbf101055 征求意见排序！！ 2021-09-09 15:31:48 +08:00
yuezhihang 721f13febc 数据同步 2021-09-09 10:04:42 +08:00
super_liu 1f84c4dfea Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!161
 2021-09-09 09:09:44 +08:00
zhaokaiyao@91isoft.com 1d915c30d2 自定义属性字段没有数据时,返回了null 2021-09-08 22:48:22 +08:00
zhaokaiyao@91isoft.com 26f28b30b6 standRegionalTimeDto 属性大小写和数据字段匹配 2021-09-08 22:26:09 +08:00
zhaokaiyao@91isoft.com ebff8a9a74 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-08 21:09:10 +08:00
zhaokaiyao@91isoft.com cf32ad9580 标准详情,实施日期 s.getPutTime()空指针 2021-09-08 21:07:29 +08:00
super_liu 39cec02fea Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the

See merge request LiuChao/foton-slrs-system-rest!159
 2021-09-08 20:46:06 +08:00
super_liu d9624669b1 feat: There is no way the 2021-09-08 20:17:22 +08:00
super_liu 692feda363 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!158
 2021-09-08 11:06:25 +08:00
zhaokaiyao@91isoft.com 7fab612a90 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-08 10:18:42 +08:00
zhaokaiyao@91isoft.com 1a03cfe68f 标准文本状态.解决无法自动废止 2021-09-08 10:17:48 +08:00
yuezhihang 5d8e14befe 清单 流程回退 2021-09-08 10:09:05 +08:00
yuezhihang 4ced2398b2 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-08 09:16:20 +08:00
super_liu 7eea5b18fa Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the #47672

See merge request LiuChao/foton-slrs-system-rest!157
 2021-09-07 17:06:04 +08:00
super_liu f7497d48bc feat: There is no way the #47672 2021-09-07 17:04:53 +08:00
Mr.Z 84190c9ddc 项目合规评估流程-项目 入到标准合规评估结果 里面 产品线、项目编号、项目名称没传值~~ 2021-09-07 16:55:28 +08:00
yuezhihang 7471709e1d Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-07 09:52:18 +08:00
yuezhihang 9729d04588 数据同步 2021-09-07 09:51:59 +08:00
Mr.Z 04dc576644 岗位管理新增查询功能以及分页功能~~ 2021-09-07 09:31:28 +08:00
Mr.Z 5d56dd4151 岗位管理新增查询功能以及分页功能~~ 2021-09-07 09:29:23 +08:00
super_liu 6a07bb4325 Merge branch 'develop_3' into 'develop_master' 
commit

See merge request LiuChao/foton-slrs-system-rest!156
 2021-09-07 09:28:32 +08:00
Mr.Z ff66ad5fbf Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-09-07 09:25:02 +08:00
zhaokaiyao@91isoft.com 7ede6c69af commit 2021-09-07 09:24:41 +08:00
yuezhihang 81a65fcf36 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-07 09:22:34 +08:00
super_liu 4db5ad822f Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!155
 2021-09-07 09:18:08 +08:00
zhaokaiyao@91isoft.com 8f91325053 excl标准写入并导出错误excl表 2021-09-07 08:45:35 +08:00
yuezhihang 02f54162d1 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-06 18:30:08 +08:00
yuezhihang fa2417d51e Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-06 18:29:54 +08:00
yanyizhou 446f8f54e9 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-06 18:29:25 +08:00
yanyizhou 912cda6762 配置管理 机构管理 查询加分页 2021-09-06 18:29:10 +08:00
zhaokaiyao@91isoft.com 0c1a57a345 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-06 18:15:17 +08:00
zhaokaiyao@91isoft.com 16e38bd98d excl标准写入 2021-09-06 18:14:54 +08:00
super_liu abad09c2ea Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!154
 2021-09-06 18:02:32 +08:00
super_liu 6683829f31 feat: There is no way the #47671 2021-09-06 18:01:09 +08:00
super_liu e85d3daecb feat: There is no way the #47611 2021-09-06 17:42:34 +08:00
super_liu 5400f5c35d Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!153
 2021-09-06 15:04:21 +08:00
zhaokaiyao@91isoft.com 307e6ddd85 commit 2021-09-06 14:29:04 +08:00
super_liu 465af62026 feat: There is no way the convert 4.3 2021-09-06 13:43:44 +08:00
super_liu 08462efc0e Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!152
 2021-09-06 09:35:25 +08:00
yanyizhou 34c73432b9 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-06 09:29:45 +08:00
yanyizhou 182b4bcf72 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-09-06 09:29:42 +08:00
yuezhihang 299c91d03e Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-06 09:12:50 +08:00
Mr.Z a88178f1c1 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-06 08:57:47 +08:00
zhaokaiyao@91isoft.com f65755b470 commit 2021-09-05 10:30:54 +08:00
zhaokaiyao@91isoft.com cee53b3df0 commit 2021-09-04 22:32:14 +08:00
zhaokaiyao@91isoft.com 75ef2d52bc 文本状态更新被代替,废止根据代替标准号 2021-09-04 22:29:15 +08:00
zhaokaiyao@91isoft.com 3146a6752d Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-04 16:44:31 +08:00
zhaokaiyao@91isoft.com 0ed76406b2 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-04 16:44:20 +08:00
yuezhihang 92207379fc Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-04 16:43:36 +08:00