FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,100 Commits 1 Branch 0 Tags
c1325190545bd5d1ce362dbf7d366fd7f06f97db
Commit Graph
2100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
super_liu c132519054 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!435
 2022-03-31 09:58:11 +08:00
super_liu 863f355d6f feat: There is no way the, 2022-03-31 09:53:49 +08:00
yuezhihang 61d6bff12b 3-29 bug 修复 2022-03-30 09:02:19 +08:00
super_liu 1769fd4218 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, 企标属性数据表 BARQ 备案日期 字段类型改为 varchar

See merge request LiuChao/foton-slrs-system-rest!434
 2022-03-29 10:52:45 +08:00
super_liu be984d157d feat: There is no way the, 企标属性数据表 BARQ 备案日期 字段类型改为 varchar 2022-03-29 10:52:09 +08:00
super_liu 6f559e9ea7 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!433
 2022-03-29 10:48:41 +08:00
super_liu 26b9a70216 feat: There is no way the, 企标属性数据表 添加查询接口 2022-03-29 10:44:00 +08:00
super_liu dda0aeae41 feat: There is no way the, 企标复审入库 修改 通用更新企标接口 2022-03-29 10:28:28 +08:00
yuezhihang 845e23d76b 征求意见最新需求 2022-03-28 17:52:10 +08:00
yuezhihang a4099ee7eb 征求意见 日期判断 2022-03-28 16:59:44 +08:00
yuezhihang 6c6e7525fa Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-28 14:08:06 +08:00
yuezhihang a9d17700d2 企标导出 2022-03-28 14:07:52 +08:00
super_liu 40a0445fd1 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!432
 2022-03-28 11:50:05 +08:00
super_liu a88f092575 feat: There is no way the, 2022-03-28 11:43:38 +08:00
super_liu 430626fac4 feat: There is no way the, 2022-03-28 11:43:11 +08:00
super_liu 152dda395e feat: There is no way the, BUG #51955 2022-03-28 11:15:45 +08:00
super_liu 4807ecde20 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!431
 2022-03-27 17:30:27 +08:00
super_liu 51a49d194b feat: There is no way the, 2022-03-27 17:29:38 +08:00
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