FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,918 Commits 1 Branch 0 Tags
a7df5f7eac197946d4ce3a62359ba160a0cd9a67
Commit Graph
2918 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CD a7df5f7eac 恢复 2023-01-13 15:32:25 +08:00
CD 4457faae39 跨域修改尝试 2023-01-13 15:26:51 +08:00
高嵩 836b4b0f95 合并分支 'dev_foton_CD' 到 'fix_foton' 
Dev foton cd

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!16
 2023-01-12 15:16:16 +08:00
高嵩 2c86fa4831 合并分支 'dev_foton_DBQ' 到 'fix_foton' 
Dev foton dbq

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!15
 2023-01-12 15:15:17 +08:00
高嵩 139e7f3e49 合并分支 'develop_master_new' 到 'fix_foton' 
Develop master new

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!14
 2023-01-12 15:14:16 +08:00
CD 28725ddfd8 bug64762 2023-01-06 10:31:46 +08:00
CD 45c3d99ec4 标准体系字段内容替换为企标体系类别 2023-01-04 16:54:56 +08:00
CD 8bacb5befe disableFlag为1的账号在角色配置的查看人员中不出现 2022-12-29 14:32:09 +08:00
CD e9cc5528d9 资料中心类型条件查询修改 2022-12-29 14:15:33 +08:00
CD a6664e7e58 资料中心显示根据当前树节点及子节点显示全部数据 2022-12-29 11:50:51 +08:00
dingbingqing 5f220ee1c2 修改/decodeDetail接口参数 2022-12-23 15:37:40 +08:00
dingbingqing 54c3f04e65 新增/decodeDetail接口 
标准解读流程汇总
 2022-12-23 09:13:24 +08:00
CD 83b38e8d3b 导出文档显示对应上下角标 2022-12-22 16:49:00 +08:00
CD 09864c36f9 注掉的消息队列放开 2022-12-22 13:32:42 +08:00
CD 9e55631f4c map空指针报错 2022-12-21 15:02:46 +08:00
dingbingqing 163b59a05c 修改/queryTaskIndex接口中的查询功能2 2022-12-15 14:55:43 +08:00
CD 26f87c21ac 非空判断 2022-12-15 14:04:13 +08:00
CD 268e8cff15 去掉本地测试用的文件地址 2022-12-15 13:42:14 +08:00
CD 3523afae94 段落中上下角标显示 2022-12-15 13:40:20 +08:00
dingbingqing bcb2fb738f 修改/queryTaskIndex接口中的查询功能 2022-12-15 09:55:07 +08:00
陈栋 d5250c0fa6 合并分支 'dev_foton_CD' 到 'fix_foton' 
Dev foton cd

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!4
 2022-12-14 16:34:05 +08:00
CD 8931636619 bug63687 2022-12-14 14:17:07 +08:00
CD d7554bf514 定时器恢复 2022-12-14 13:42:32 +08:00
cuijiaming 1c2df15b00 新增汇总指定任务接口/queryTaskIndex 2022-12-14 13:34:44 +08:00
dingbingqing f95be0577b 新增接口lawss/activiti/get_list_by_instance 
流程实例汇总列表，已办流程中的汇总功能
 2022-12-13 09:28:48 +08:00
高嵩 8cd4537286 合并分支 'dev_foton_CJM' 到 'fix_foton' 
征求意见-（代码修改）

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!3
 2022-12-08 17:09:28 +08:00
liyawei 95884095fb 临时手动更新ALL标准数据索引 2022-12-08 14:41:18 +08:00
cuijiaming 89106c2bab 征求意见-（代码修改） 2022-12-07 17:30:39 +08:00
李雅玮 23d50e06d1 Merge branch 'FOTON' into 'develop_master' 
# Conflicts:
#   adc-da-main/src/main/resources/application.properties
 2022-12-07 16:38:07 +08:00
李雅玮 35cd42ed14 合并分支 'develop_master_new' 到 'develop_master' 
Develop master new

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!1
 2022-12-07 16:36:35 +08:00
CD 372408ac30 企标废止逻辑修正 2022-12-07 13:59:31 +08:00
gaojiabao 728d5c8d25 更名流程-将更名流程走完后，企标计划的名称 2022-12-05 15:34:35 +08:00
gaojiabao aafda76be6 Merge remote-tracking branch 'origin/develop_master_new' into develop_master_new 2022-12-05 15:15:20 +08:00
gaojiabao e715c57b7e 更名流程-将更名流程走完后，企标计划的名称并没有修改 BUG 2022-12-05 15:15:08 +08:00
CD 2f4c74034e Merge remote-tracking branch 'origin/develop_master_new' into develop_master_new 2022-12-05 14:58:25 +08:00
CD b8f9905518 新增角色时添加首页菜单 2022-12-05 14:58:06 +08:00
gaojiabao c0839a370b 更名流程-将更名流程走完后，企标计划的名称并没有修改 BUG 2022-12-05 12:00:28 +08:00
CD 6175ae4785 恢复 2022-12-02 18:13:41 +08:00
CD 2559c51c45 bug62690 2022-12-02 14:04:29 +08:00
CD e7faa9ad2a Merge branch 'develop_master' into FOTON 2022-12-01 20:39:03 +08:00
gaojiabao 6b4812247c Merge remote-tracking branch 'origin/develop_master_new' into develop_master_new 2022-12-01 14:19:33 +08:00
gaojiabao 77d30f9d0b 更名流程-将更名流程走完后，企标计划的名称并没有修改 BUG 2022-12-01 14:19:19 +08:00
cuijiaming 6175ea6b9f 征求意见-查询出来的数据跟数据的查询条件不符合（已解决） 2022-12-01 11:47:37 +08:00
CD 546a839d12 根据树id查找对应层级的节点 2022-11-28 13:36:40 +08:00
CD e06e37f203 Merge remote-tracking branch 'origin/develop_master_new' into develop_master_new 2022-11-25 17:51:07 +08:00
CD 94fef5e08f bug273、bug274 2022-11-25 17:50:42 +08:00
liyawei 1372f306ea 生产环境配置文件恢复 2022-11-24 17:42:22 +08:00
liyawei 044468b7f5 Merge remote-tracking branch 'origin/develop_master' into FOTON 
# Conflicts:
#	adc-da-main/src/main/resources/application-dev.properties
 2022-11-24 17:30:46 +08:00
liyawei 50ded28c72 开发环境配置文件更新 2022-11-24 14:48:32 +08:00
liyawei 19d89cb73f Merge branch 'develop_master' into FOTON 2022-11-22 20:34:25 +08:00