FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,923 Commits 1 Branch 0 Tags
57a770254ca8848d2c383dab3bd7ac62b7e125ac
Commit Graph
1328 Commits
Author SHA1 Message Date
yuezhihang 57a770254c Merge remote-tracking branch 'origin/FOTON' into develop_master 2022-02-17 17:36:28 +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
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 5206fe004b 接口上加注解EpcLog 并加备注 可存储操作日志 2022-02-16 16:07:40 +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
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 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 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
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
王夏晖 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
zhaokaiyao@91isoft.com 0cb9d6c3f7 label写成了 lable 2022-01-25 15:42:57 +08:00
yuezhihang 3c295a6e3e Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-24 22:22:39 +08:00
yuezhihang d2dfa6b2b0 标准合规评估查询条件 以及征求意见流程内导出 新增字段 2022-01-24 22:22:33 +08:00
zyd 4cff14d6cb fix:模块单元中后端接口查询时先查询卡车类的数据 2022-01-24 21:01:57 +08:00
super_liu 986092d8ea Merge branch 'develop_master' into FOTON 2022-01-24 20:10:43 +08:00
super_liu b992c47c94 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss state

See merge request LiuChao/foton-slrs-system-rest!391
 2022-01-24 20:08:42 +08:00
super_liu 01a0a31d15 feat: There is no way the, buss state 2022-01-24 20:00:01 +08:00
zhaokaiyao@91isoft.com a7c33531a7 Merge remote-tracking branch 'origin/FOTON' into develop_3 2022-01-24 19:26:52 +08:00
zhaokaiyao@91isoft.com f721b08970 国内外标准入库 关联体系目录新增与带入 2022-01-24 18:25:58 +08:00
zhaokaiyao@91isoft.com 3ebb6c9dc2 企标库 ,代替标准号 2022-01-24 16:07:29 +08:00
zhaokaiyao@91isoft.com 8f650eeb81 标准入库流程带入标准的目录体系: 多余字段和break条件 2022-01-24 15:11:59 +08:00
zyd cbd9ca5959 fix: 模块单元数据 重新处理以及支持卡车和乘用车两种类型 2022-01-23 22:48:24 +08:00
zhaokaiyao@91isoft.com 2bc533d3ec Merge remote-tracking branch 'origin/develop_master' into develop_3 2022-01-22 19:24:03 +08:00