Commit Graph

Select branches

Hide Pull Requests

dev_20231201_feizhi

Mono Color

• 3db5b66721 Merge remote-tracking branch 'origin/FOTON' into FOTON zj 2021-12-16 14:05:26 +08:00
• a757bd9b0d Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-16 14:04:47 +08:00
• 4eda945927 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-16 11:03:17 +08:00
• 13e373f148 新流程发起接口 yuezhihang 2021-12-16 11:03:07 +08:00
• a4a35fc38a Merge remote-tracking branch 'origin/FOTON' into FOTON zj 2021-12-16 10:55:33 +08:00
• 0e19635a56 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-16 10:54:32 +08:00
• 869021a681 Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-12-16 10:52:57 +08:00
• 440f0323d6 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-12-16 10:40:59 +08:00
• a642c5eaa5 查询原始文件信息接口 zhaokaiyao@91isoft.com 2021-12-16 10:40:25 +08:00
• c214c4d7a6 Merge remote-tracking branch 'origin/develop_master' into FOTON zj 2021-12-16 09:51:21 +08:00
• 067558303a Merge remote-tracking branch 'origin/develop_master' into develop_master zj 2021-12-16 09:49:41 +08:00
• fef874c5ce 增加获取流程图片地址过滤 zj 2021-12-16 09:48:16 +08:00
• 4e32bb7ee5 Merge remote-tracking branch 'origin/FOTON' into FOTON zj 2021-12-16 09:09:04 +08:00
• aec8010403 Merge remote-tracking branch 'origin/FOTON' into FOTON super_liu 2021-12-15 21:18:35 +08:00
• f8309fdce0 feat: There is no way the super_liu 2021-12-15 14:26:03 +08:00
• 9dc572e3d9 feat: There is no way the Superman_Main 2021-12-08 21:26:20 +08:00
• 0877fb2df8 feat: There is no way the Superman_Main 2021-11-20 16:46:00 +08:00
• 5ef31f9837 feat: There is no way the Superman_Main 2021-11-20 11:31:26 +08:00
• b030fb3e89 update:更新拆分图片存储位置 2510220824 2021-11-19 15:14:23 +08:00
• 7ee5bab2e4 update:新增拆分图片路径配置 2510220824 2021-11-19 11:25:57 +08:00
• e605e9d93c update:修正线上ocr识别文件存储地址 2510220824 2021-11-18 17:27:08 +08:00
• f5b4ccc073 Merge branch 'develop_3' into 'develop_master' super_liu 2021-12-15 21:14:25 +08:00
• bfc305b1bf Merge branch 'develop_master' into FOTON super_liu 2021-12-15 21:13:34 +08:00
• 56ba29c455 Merge remote-tracking branch 'origin/develop_master' into FOTON zj 2021-12-15 19:55:32 +08:00
• c73f9b50d4 修改文件上传默认路径 zj 2021-12-15 19:54:18 +08:00
• 3bbbc90900 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-12-15 17:50:57 +08:00
• f00f5b9021 commit zhaokaiyao@91isoft.com 2021-12-15 17:50:25 +08:00
• c1ee44b19f Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-15 16:17:53 +08:00
• 14e2b3368c 拆分和ocr查询文件出错问题 yuezhihang 2021-12-15 16:15:29 +08:00
• 0fafe93d39 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-12-15 15:17:35 +08:00
• 5b64f69989 资料中心接口 zhaokaiyao@91isoft.com 2021-12-15 15:17:18 +08:00
• 2762526260 水印透明度 在beginText方法后才能生效 zhaokaiyao@91isoft.com 2021-12-15 15:16:55 +08:00
• 79e7719be4 feat: There is no way the super_liu 2021-12-15 14:26:03 +08:00
• 4fa4854e55 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-15 11:22:57 +08:00
• 0a26dbfda9 工作组 yuezhihang 2021-12-15 11:22:19 +08:00
• 19cfb7c27f Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-15 11:06:33 +08:00
• 67deb52111 工作组下 关联属性删除1 yuezhihang 2021-12-15 11:05:00 +08:00
• e35990d25f Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-12-15 10:41:51 +08:00
• bb5cd0a360 清单详情 因为实施日期报错 zhaokaiyao@91isoft.com 2021-12-15 10:41:31 +08:00
• ebd5c94057 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-15 10:14:52 +08:00
• 99f33ac218 工作组 单位不回显bug修复 yuezhihang 2021-12-15 10:14:45 +08:00
• 2b7c98acee Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-15 09:16:47 +08:00
• 0964813f89 Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-12-15 09:16:25 +08:00
• 1062cd6c36 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-12-15 09:10:07 +08:00
• e814c496d5 feat: There is no way the, super_liu 2021-12-15 09:09:22 +08:00
• 121dc4b965 feat: There is no way the, super_liu 2021-12-15 09:08:41 +08:00
• 417df71582 Merge branch 'develop_master' into FOTON super_liu 2021-12-14 21:56:59 +08:00
• 1e83fad8bd feat: There is no way the super_liu 2021-12-14 21:56:42 +08:00
• 3162479ce1 Merge branch 'develop_master' into FOTON super_liu 2021-12-14 21:48:43 +08:00
• 6b8868a9b1 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-12-14 21:24:06 +08:00
• 7521af3dd0 feat: There is no way the, buss process super_liu 2021-12-14 21:18:43 +08:00
• 246a9c01c9 下载带水印 zhaokaiyao@91isoft.com 2021-12-14 20:28:03 +08:00
• 02f0fb0cd7 体系结构缺少-内存中构造树结构时没有把改节点查出 zhaokaiyao@91isoft.com 2021-12-14 20:27:49 +08:00
• cae1605ab1 工作组修改完已经可以回显 yuezhihang 2021-12-14 17:45:23 +08:00
• 5eeb60b7f3 资料中心 zhaokaiyao@91isoft.com 2021-12-14 17:09:05 +08:00
• a8fda1bb94 标准清单查询接口!!! yuezhihang 2021-12-14 16:33:07 +08:00
• 0babd2b56f 统一修改了一下分页 yuezhihang 2021-12-14 16:07:51 +08:00
• 36568f8c19 重点认证新增和删除逻辑完善 zhaokaiyao@91isoft.com 2021-12-14 13:55:31 +08:00
• 2412b50953 预警标表头和列宽 zhaokaiyao@91isoft.com 2021-12-14 10:32:25 +08:00
• e90575d626 Merge branch 'develop_master' into FOTON super_liu 2021-12-13 20:19:50 +08:00
• 6db9220082 手机端查询人员数据 yuezhihang 2021-12-13 17:49:33 +08:00
• 301ba42d65 手机端查人接口 以及 部分涉及到开耀的接口 加了备注 我先改了一下 等开耀回来看一下 yuezhihang 2021-12-13 16:17:25 +08:00
• c87d843055 征求意见流程新---！！！！ yuezhihang 2021-12-13 14:15:44 +08:00
• 1a88f21eb0 未符合项整改回显 yuezhihang 2021-12-12 10:52:29 +08:00
• 387b7485bf Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-12-10 17:16:12 +08:00
• 11dbe628c8 评分计算 zhaokaiyao@91isoft.com 2021-12-10 17:01:07 +08:00
• 8537648dde 评分历史排序 zhaokaiyao@91isoft.com 2021-12-10 16:15:39 +08:00
• e6aa1bf44f 评分查询 bug查询不够精确 zhaokaiyao@91isoft.com 2021-12-10 15:40:00 +08:00
• c783f40d41 预警excel导出 数据与表格对应 zhaokaiyao@91isoft.com 2021-12-10 15:38:41 +08:00
• 48bc83ff4f Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-10 14:49:46 +08:00
• 2623bb0954 国内清单!! yuezhihang 2021-12-10 14:49:41 +08:00
• 91dcda3f4e Merge branch 'develop_migration' into 'develop_master' super_liu 2021-12-10 14:33:55 +08:00
• 97261de96e Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-10 13:51:31 +08:00
• 483429fb8b 未符合项目整改--》批量关闭未符合项目接口 直接修改的closeStatus yuezhihang 2021-12-10 13:51:26 +08:00
• 13b5444e24 质量评分节点 zhaokaiyao@91isoft.com 2021-12-10 13:47:42 +08:00
• 22faad46db 分解单默认正序排序 zhaokaiyao@91isoft.com 2021-12-10 13:45:07 +08:00
• 3bad62d5eb Merge branch 'develop_master' into develop_migration Superman_Main 2021-12-10 10:43:34 +08:00
• 3156acafd2 feat: There is no way the, buss Superman_Main 2021-12-10 10:42:13 +08:00
• 1d290e6fed 恢复拦截 zhaokaiyao@91isoft.com 2021-12-09 19:44:32 +08:00
• 1c2648e526 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-09 19:37:15 +08:00
• 304bebc284 Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-12-09 19:36:43 +08:00
• a86fe68308 预警导出 和 定时任务 zhaokaiyao@91isoft.com 2021-12-09 17:49:51 +08:00
• 5cfa69c8e3 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-09 16:56:05 +08:00
• 45dab72515 标准条件查询 yuezhihang 2021-12-09 16:55:55 +08:00
• a879fd9ff2 Merge branch 'develop_3' into 'develop_master' super_liu 2021-12-09 15:20:48 +08:00
• fd9bf0f130 查看分解单 实施日期多个 zhaokaiyao@91isoft.com 2021-12-09 14:27:29 +08:00
• 0cabb928d7 查看分解单 实施日期多个 zhaokaiyao@91isoft.com 2021-12-09 14:26:50 +08:00
• 276f0a9726 企标评分 zhaokaiyao@91isoft.com 2021-12-09 13:45:49 +08:00
• 751448384a Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-12-09 13:33:10 +08:00
• 2f402f737d 公开征求意见导出 部门数据导出 yuezhihang 2021-12-09 10:24:10 +08:00
• 6e52fb44bf Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-12-09 10:09:31 +08:00
• ab07fbf9ce 新增标准与修改标准 插入数据库取消时分秒 zhaokaiyao@91isoft.com 2021-12-09 10:07:20 +08:00
• bdf1692e62 feat: There is no way the Superman_Main 2021-12-08 21:26:20 +08:00
• f7985d0173 Merge branch 'develop_master' into FOTON Superman_Main 2021-12-08 21:24:36 +08:00
• c4eb74a211 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-12-08 17:24:48 +08:00
• 2bbdb32e8f 项目维度查询分解单数据错误bug yuezhihang 2021-12-08 17:23:06 +08:00
• 9271020c86 Merge branch 'develop_master' into FOTON Superman_Main 2021-12-08 15:53:57 +08:00
• 867f147edb Merge branch 'origin/Three' into 'develop_master' super_liu 2021-12-08 15:51:11 +08:00
• d9f7c7ea8b Merge branch 'develop_master' into origin/Three Superman_Main 2021-12-08 15:49:59 +08:00
• c53b405891 技术评估结果排序--》猜测需要添加字段区分国内海外 ！！！ 后续看需求是否添加 yuezhihang 2021-12-08 14:06:21 +08:00