 super_liu
|
7902f3ea19
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, xxxxx
See merge request LiuChao/foton-slrs-system-rest!430
|
2022-03-25 21:23:21 +08:00 |
|
|
super_liu
|
25a36eff18
|
feat: There is no way the, xxxxx
|
2022-03-25 21:22:14 +08:00 |
|
|
super_liu
|
d0c27e46f6
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, bug #52092
See merge request LiuChao/foton-slrs-system-rest!429
|
2022-03-25 17:09:16 +08:00 |
|
|
super_liu
|
9c3cf24422
|
feat: There is no way the, bug #52092
|
2022-03-25 17:07:46 +08:00 |
|
|
super_liu
|
3c95778f70
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 企标代替被代替
See merge request LiuChao/foton-slrs-system-rest!428
|
2022-03-25 13:33:13 +08:00 |
|
|
super_liu
|
a1475db743
|
feat: There is no way the, 企标代替被代替
|
2022-03-25 13:32:10 +08:00 |
|
|
super_liu
|
0c2acec862
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 企标代替被代替
See merge request LiuChao/foton-slrs-system-rest!427
|
2022-03-25 11:15:14 +08:00 |
|
|
super_liu
|
e4596c2044
|
feat: There is no way the, 企标代替被代替
|
2022-03-25 11:13:31 +08:00 |
|
|
super_liu
|
d2867766b2
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, x
See merge request LiuChao/foton-slrs-system-rest!426
|
2022-03-24 23:45:47 +08:00 |
|
|
super_liu
|
ed3882149a
|
feat: There is no way the, x
|
2022-03-24 23:44:50 +08:00 |
|
|
super_liu
|
b08c8465b4
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, x
See merge request LiuChao/foton-slrs-system-rest!425
|
2022-03-24 23:25:18 +08:00 |
|
|
super_liu
|
7c99eebac7
|
feat: There is no way the, x
|
2022-03-24 23:24:45 +08:00 |
|
|
super_liu
|
62fba506a4
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, bug #51957
See merge request LiuChao/foton-slrs-system-rest!424
|
2022-03-24 23:21:59 +08:00 |
|
|
super_liu
|
36194ba8eb
|
feat: There is no way the, bug #51957
|
2022-03-24 23:21:25 +08:00 |
|
|
super_liu
|
a9c0d8bb1c
|
Merge branch 'develop_migration' into 'develop_master'
Develop migration
See merge request LiuChao/foton-slrs-system-rest!423
|
2022-03-24 22:56:51 +08:00 |
|
|
super_liu
|
d153a3be0f
|
feat: There is no way the,
|
2022-03-24 22:55:15 +08:00 |
|
|
super_liu
|
309b59405c
|
feat: There is no way the, 导出优化 字段维护
|
2022-03-24 18:21:29 +08:00 |
|
|
yuezhihang
|
1c73ac3e8a
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-24 16:41:08 +08:00 |
|
|
yuezhihang
|
0e3a67204d
|
标准入库流程 直接处理带入数据的回显项 --归档位置
|
2022-03-24 16:40:59 +08:00 |
|
|
super_liu
|
c4a7cad347
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, BUG #51976
See merge request LiuChao/foton-slrs-system-rest!422
|
2022-03-24 10:01:46 +08:00 |
|
|
super_liu
|
7067c45637
|
feat: There is no way the, BUG #51976
|
2022-03-24 09:56:27 +08:00 |
|
|
11528
|
295a6a59fd
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-24 09:47:18 +08:00 |
|
|
11528
|
3669a6e888
|
工作组导入
|
2022-03-24 09:47:06 +08:00 |
|
|
yuezhihang
|
4ace839e1f
|
加了个部门的查询条件
|
2022-03-23 17:46:13 +08:00 |
|
|
yuezhihang
|
461caf2105
|
角色管理查看人员增加部门显示-后台代码
|
2022-03-23 17:40:11 +08:00 |
|
|
yuezhihang
|
9b2b957335
|
注解
|
2022-03-23 16:55:27 +08:00 |
|
|
yuezhihang
|
2ac8eda3be
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-23 16:54:30 +08:00 |
|
|
yuezhihang
|
890e6bc463
|
公共导入方法 新增校验模板功能 过滤excel纯空行数据功能
|
2022-03-23 16:54:24 +08:00 |
|
|
zhangyanduan
|
776fdd3e51
|
Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master
|
2022-03-23 16:30:21 +08:00 |
|
|
11528
|
9f3206ca93
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-23 15:48:16 +08:00 |
|
|
11528
|
4c40e4dbb1
|
岗位管理操作人显示
|
2022-03-23 15:48:03 +08:00 |
|
|
yuezhihang
|
eaf00ffb34
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-23 15:32:03 +08:00 |
|
|
yuezhihang
|
aefc5c72a5
|
清除公开征求意见
|
2022-03-23 15:31:56 +08:00 |
|
|
super_liu
|
fcc739de48
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, bug #51962
See merge request LiuChao/foton-slrs-system-rest!421
|
2022-03-23 14:53:54 +08:00 |
|
|
super_liu
|
98a47392b6
|
feat: There is no way the, bug #51962
|
2022-03-23 14:53:00 +08:00 |
|
|
yuezhihang
|
cee8fb564f
|
企标制修订计划导入
|
2022-03-23 10:23:41 +08:00 |
|
|
yuezhihang
|
87e36d5088
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-22 17:30:38 +08:00 |
|
|
yuezhihang
|
86b9eabd03
|
企标制修订计划立项-导入 修复 ，高级查询失效修复
|
2022-03-22 17:30:29 +08:00 |
|
|
super_liu
|
7e41d25944
|
feat: There is no way the, 配置文件 添加 pdg 文件类型
|
2022-03-22 16:57:59 +08:00 |
|
|
super_liu
|
e2c571a6cd
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 政策库注掉数据权限
See merge request LiuChao/foton-slrs-system-rest!420
|
2022-03-22 11:42:42 +08:00 |
|
|
super_liu
|
9868de7e0a
|
feat: There is no way the, 政策库注掉数据权限
|
2022-03-22 11:40:37 +08:00 |
|
|
11528
|
476476048d
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-22 09:56:31 +08:00 |
|
|
11528
|
e2058872f4
|
岗位管理操作人
|
2022-03-22 09:56:23 +08:00 |
|
|
yuezhihang
|
dc585e7840
|
高级查询多日期只检索第一个
|
2022-03-21 09:47:44 +08:00 |
|
|
yuezhihang
|
47ebd2a685
|
bug修复
|
2022-03-19 15:19:19 +08:00 |
|
|
yuezhihang
|
86b618eac3
|
项目 同步数据----部分数据需要从已维护变为未维护
|
2022-03-19 14:48:54 +08:00 |
|
|
yuezhihang
|
e257b13803
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2022-03-18 16:52:03 +08:00 |
|
|
yuezhihang
|
4b8f755b92
|
3-16
|
2022-03-18 16:51:48 +08:00 |
|
|
11528
|
ad61fcf381
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
|
2022-03-18 16:41:16 +08:00 |
|
|
11528
|
e7ccb5c4d7
|
岗位：操作时间，机构：委员会编辑，项目合规：查询
|
2022-03-18 16:39:37 +08:00 |
|