FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,926 Commits 1 Branch 0 Tags
0c282f3e4be15ce9307c0a830ec97f5d7da016bb
Commit Graph
1926 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yuezhihang 0c282f3e4b Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-02-17 17:36:37 +08:00
yuezhihang 57a770254c Merge remote-tracking branch 'origin/FOTON' into develop_master 2022-02-17 17:36:28 +08:00
super_liu c6b36f72e1 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, 新企标复审入库

See merge request LiuChao/foton-slrs-system-rest!401
 2022-02-17 17:27:45 +08:00
yuezhihang 03e4f956d1 操作日志日期倒序 2022-02-17 17:14:25 +08:00
yuezhihang 584daa94b5 基础库 操作日志添加 2022-02-17 17:13:09 +08:00
2510220824 2c59302da4 update:增加统一前缀 2022-02-17 15:04:43 +08:00
super_liu 8e7e210d35 feat: There is no way the, 新企标复审入库 2022-02-17 14:48:26 +08:00
2510220824 4e722f17ef update:操作类型接口 2022-02-17 14:38:40 +08:00
2510220824 97e82b0248 Merge remote-tracking branch 'origin/develop_master' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java
 2022-02-17 14:17:28 +08:00
2510220824 a6cee426de update:操作日志查询、新增接口 2022-02-17 14:15:36 +08:00
yuezhihang 3459fa04aa 国内库查询日志 2022-02-17 14:03:40 +08:00
yuezhihang 31171e2580 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-02-16 16:07:49 +08:00
yuezhihang 5206fe004b 接口上加注解EpcLog 并加备注 可存储操作日志 2022-02-16 16:07:40 +08:00
super_liu f97f0d6e9c Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, 在线编辑 修改传参

See merge request LiuChao/foton-slrs-system-rest!400
 2022-02-16 08:56:14 +08:00
super_liu 95674848f2 feat: There is no way the, 在线编辑 修改传参 2022-02-15 16:27:19 +08:00
super_liu 658058a84f Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!399
 2022-02-11 17:16:20 +08:00
super_liu 012df3992a feat: There is no way the, 2022-02-10 20:40:41 +08:00
zyd 59a2d5d727 fix:关掉文本状态更新逻辑的定时任务 2022-02-10 09:27:40 +08:00
zyd 3d2917e110 fix: 修改数据库SQL语句 2022-02-09 08:54:03 +08:00
super_liu 6a56242ee4 feat: There is no way the, 2022-02-08 20:06:43 +08:00
super_liu 5e58d5212a Merge branch 'develop_master' into FOTON 2022-02-07 17:14:25 +08:00
yuezhihang b985a9933b 完成任务接口并更新草稿 2022-02-07 15:15:18 +08:00
yuezhihang 9951bd55fd Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-02-07 09:32:32 +08:00
super_liu 267554936f Merge branch 'develop_master' into FOTON 2022-01-28 21:47:51 +08:00
super_liu 6af05b4947 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!398
 2022-01-28 16:33:37 +08:00
super_liu 716c8c1ed6 feat: There is no way the, 2022-01-28 16:22:23 +08:00
zyd b8b9ede96c fix: 模块单元新增字段SQL语句提交 2022-01-27 23:13:43 +08:00
zyd dad72335e7 Merge branch 'FOTON' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into FOTON 2022-01-27 22:58:51 +08:00
zyd 411fe8bba5 fix: 修复查询模块单元数据时数据接口查询报错的BUG 2022-01-27 22:58:47 +08:00
super_liu 5b4f58d9db Merge branch 'develop_master' into FOTON 2022-01-27 22:44:41 +08:00
super_liu 34b0513275 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!396
 2022-01-27 22:40:46 +08:00
super_liu f6cbfdf178 feat: There is no way the, 2022-01-27 22:38:34 +08:00
zyd a8f34b227c update： VPPS-220127版本 2022-01-27 20:50:19 +08:00
yuezhihang add013d55e Merge remote-tracking branch 'origin/develop_3' into develop_master 2022-01-27 19:08:55 +08:00
zhaokaiyao@91isoft.com 90e2d27706 containsKey 2022-01-27 16:22:02 +08:00
zhaokaiyao@91isoft.com fdd3003916 回滚 2022-01-27 15:06:45 +08:00
yuezhihang 4f6926ddf7 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-27 09:36:03 +08:00
王夏晖 607a131fb5 Merge branch 'develop_3' into 'develop_master' 
标准新增以及编辑时 代替标准号在我的收藏中时,此标准也将插入我的收藏

See merge request LiuChao/foton-slrs-system-rest!394
 2022-01-27 09:34:52 +08:00
yuezhihang e9ddea77da Merge remote-tracking branch 'origin/develop_3' into develop_master 2022-01-27 09:34:43 +08:00
super_liu 8d1594d6cb Merge branch 'develop_master' into FOTON 2022-01-27 08:32:18 +08:00
2510220824 a89e642f00 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-26 23:05:06 +08:00
zhaokaiyao@91isoft.com 4379ede739 标准新增以及编辑时 代替标准号在我的收藏中时,此标准也将插入我的收藏 2022-01-26 23:02:32 +08:00
yuezhihang bd2b70930f Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-26 20:38:02 +08:00
yuezhihang b1ecd09547 分解单查询接口 标准评估流程用 2022-01-26 20:37:55 +08:00
2510220824 cde2bb97e8 update:修正合并条款造成解读时条款不显示的问题 2022-01-26 19:19:36 +08:00
王夏晖 3ed58ba0db Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!393
 2022-01-26 14:55:24 +08:00
zhaokaiyao@91isoft.com 59e44f1e7e 查询体系目录接口 新增 入库时不显示"我的收藏" 2022-01-25 22:45:37 +08:00
super_liu 7dc4c65fbd Merge branch 'develop_master' into FOTON 2022-01-25 20:15:57 +08:00
super_liu dc559482ac Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss state scheduled

See merge request LiuChao/foton-slrs-system-rest!392
 2022-01-25 20:11:08 +08:00
super_liu ccaf7d5b86 feat: There is no way the, buss state scheduled 2022-01-25 18:42:46 +08:00