Commit Graph

Select branches

Hide Pull Requests

dev_20231201_feizhi

Mono Color

• 7eb806ed14 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-11-01 09:58:00 +08:00
• 78b458a361 Merge branch 'develop_master' into develop_migration super_liu 2021-11-01 09:57:05 +08:00
• f54c8ea63b feat: There is no way the,laws super_liu 2021-11-01 09:43:13 +08:00
• 4b1f6503e6 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-10-30 21:08:29 +08:00
• 6f7e92f686 feat: There is no way the, LAWS super_liu 2021-10-30 21:06:07 +08:00
• 495f3c72ee feat: There is no way the super_liu 2021-10-30 12:42:25 +08:00
• 148cdd5d42 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-10-30 00:56:26 +08:00
• 1928ae8868 Merge branch 'develop_master' into develop_migration super_liu 2021-10-30 00:55:32 +08:00
• 831f8d321a feat: There is no way the super_liu 2021-10-29 23:53:33 +08:00
• 539cf47101 清单 流程回退 yuezhihang 2021-10-29 14:02:47 +08:00
• 62c18594db feat: There is no way the Laws super_liu 2021-10-28 18:10:31 +08:00
• 0d18758178 项目评估流程标准维度-查询数据来源修复 yuezhihang 2021-10-27 13:47:29 +08:00
• 9ec34d5125 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-10-27 13:39:58 +08:00
• d02b73e2dd 标准库查询 和 流程发起界面查询 做了一个标志位的区分 目的是为了提高标准库的查询速度 yuezhihang 2021-10-27 13:39:07 +08:00
• 2504cac460 Merge remote-tracking branch 'origin/develop_master' into develop_master super_liu 2021-10-27 13:36:09 +08:00
• c2e7b589d2 feat: There is no way the super_liu 2021-10-27 13:35:51 +08:00
• a675e374bc 清单 流程回退 yuezhihang 2021-10-27 09:38:56 +08:00
• 23e70eba5b Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-10-25 15:10:04 +08:00
• 59a7702e27 流程最新的发起Key yuezhihang 2021-10-25 15:09:55 +08:00
• 7dcfe2dd03 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-10-25 14:06:41 +08:00
• ac60a29630 feat: There is no way the super_liu 2021-10-25 14:05:28 +08:00
• 055c562a99 Merge branch 'develop_master' into develop_migration super_liu 2021-10-25 12:01:46 +08:00
• e7b2873362 feat: There is no way the super_liu 2021-10-25 11:55:32 +08:00
• 43dd76cc5f Merge remote-tracking branch 'origin/develop_3' into develop_3 zhaokaiyao@91isoft.com 2021-10-25 09:20:41 +08:00
• 89b4bfdd8d Merge branch 'develop_3' into 'develop_master' super_liu 2021-10-22 18:02:44 +08:00
• 3cd41c45d7 feat: There is no way the, TO optimize the query super_liu 2021-10-22 17:53:11 +08:00
• 48c3da1bae Merge remote-tracking branch 'origin/develop_master' into develop_master super_liu 2021-10-22 17:03:46 +08:00
• 1918e0da78 feat: There is no way the, TO optimize the query super_liu 2021-10-22 17:03:29 +08:00
• c604ad2461 feat: There is no way the super_liu 2021-10-22 16:04:25 +08:00
• 9eff2340a2 feat: There is no way the, TO optimize the query super_liu 2021-10-22 15:50:07 +08:00
• ed1762a7ec 标准发布日期查询 zhaokaiyao@91isoft.com 2021-10-21 18:25:14 +08:00
• 84916bb230 标准法规清单-新增-导出 程序异常 yanyizhou 2021-10-21 14:37:34 +08:00
• 0ee4f63614 项目清单->项目经理 zhaokaiyao@91isoft.com 2021-10-21 13:51:27 +08:00
• 54125b736d commit yanyizhou 2021-10-21 10:51:38 +08:00
• 6a9d736aa8 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-10-21 09:12:38 +08:00
• 5c743e92c0 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-10-20 21:30:48 +08:00
• 4b30022ae5 标准excl导入 zhaokaiyao@91isoft.com 2021-10-20 21:30:36 +08:00
• 13332aaaa3 车型项目,PCMS组织信息,模块结构同步数据返回值修改,以及车型项目json重写 zhaokaiyao@91isoft.com 2021-10-20 21:30:02 +08:00
• 831869f424 key(11,12,13)_张超然 Kevin 2021-10-20 16:18:53 +08:00
• d8053efe8e Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-10-20 15:51:05 +08:00
• 4ebe597ed4 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-10-20 14:53:46 +08:00
• bef55f395a TODO模块单元树结构 zhaokaiyao@91isoft.com 2021-10-20 14:52:07 +08:00
• f6508c6e1a TODO标准excl导入 zhaokaiyao@91isoft.com 2021-10-20 14:51:05 +08:00
• 7b87743f9f TODO树形结构Hash zhaokaiyao@91isoft.com 2021-10-20 14:49:51 +08:00
• 900bcb9c14 add:福田生产环境配置 2510220824 2021-10-20 14:36:20 +08:00
• ad91f84dfb 当前参数为标准类别时需要输入的code为name值 zhaokaiyao@91isoft.com 2021-10-20 14:33:21 +08:00
• d09cdb1d42 通过id绑定责任工程师和责任部门名称 zhaokaiyao@91isoft.com 2021-10-20 11:24:49 +08:00
• 740db92f90 commit zhaokaiyao@91isoft.com 2021-10-19 17:58:11 +08:00
• f74da3d65d 查询机构人员,模糊查询,不需要id zhaokaiyao@91isoft.com 2021-10-19 17:21:12 +08:00
• 8d522a4304 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-10-19 16:50:06 +08:00
• 4d1876b8c4 岗位配置模糊查询分页 zhaokaiyao@91isoft.com 2021-10-19 16:49:48 +08:00
• c19d77c06d 标准法规清单的导出 yanyizhou 2021-10-19 16:46:06 +08:00
• dba3ce87af Merge remote-tracking branch 'origin/develop_master' into develop_master 2510220824 2021-10-19 16:18:34 +08:00
• 59c8f0f60b add:优化机构管理人员查询，不传机构就查全部 2510220824 2021-10-19 16:18:11 +08:00
• 6b914c1430 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-10-18 17:21:43 +08:00
• a125490d19 企业标准导出加入白名单 zhaokaiyao@91isoft.com 2021-10-18 17:21:22 +08:00
• 60fd2eb999 抽出方法 zhaokaiyao@91isoft.com 2021-10-18 17:13:43 +08:00
• acbece6b2a 机构树形结构 不采用用递归查询数据库 zhaokaiyao@91isoft.com 2021-10-18 16:46:24 +08:00
• 3811b5f682 feat: There is no way the super_liu 2021-10-18 14:00:04 +08:00
• d36aa25397 feat: There is no way the super_liu 2021-10-18 12:51:25 +08:00
• e4b69635be Merge branch 'develop_migration' into 'develop_master' super_liu 2021-10-18 12:45:52 +08:00
• 91ff42cb12 feat: There is no way the user jwt super_liu 2021-10-18 12:45:02 +08:00
• 8317333e96 feat: There is no way the super_liu 2021-10-18 10:37:44 +08:00
• 4286ae309c 标准excl导入 zhaokaiyao@91isoft.com 2021-10-17 19:59:00 +08:00
• ea6e89c2bd Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-10-17 19:58:05 +08:00
• 7358e84b82 sql优化,保留标准类别 standSortShow zhaokaiyao@91isoft.com 2021-10-17 19:50:47 +08:00
• 1aef6454ab Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-10-17 18:44:15 +08:00
• dba0c2e86a 附件下载接口加入白名单 zhaokaiyao@91isoft.com 2021-10-17 18:43:31 +08:00
• b99983e910 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-10-17 18:41:13 +08:00
• b790264f77 导入标准信息excl导出工具 zhaokaiyao@91isoft.com 2021-10-17 18:40:53 +08:00
• 785ef90acd sql优化 zhaokaiyao@91isoft.com 2021-10-17 18:39:57 +08:00
• 33254f05f8 模块结构单元,查询 zhaokaiyao@91isoft.com 2021-10-17 16:12:23 +08:00
• 9b5bf72fad 文件后缀大写 zhaokaiyao@91isoft.com 2021-10-17 14:26:44 +08:00
• a68d9c9e9d add：修改pcms数据下发接口，统一访问前缀 2510220824 2021-10-16 09:46:26 +08:00
• 89116af8bf Merge remote-tracking branch 'origin/develop_master' into develop_master 2510220824 2021-10-16 09:34:08 +08:00
• 8b479fca0c add:修改用户获取权限，修改pcms数据同步 2510220824 2021-10-16 09:33:48 +08:00
• c25f07db08 Merge branch 'develop_3' into 'develop_master' super_liu 2021-10-15 14:52:44 +08:00
• ffa894865c 接口拦截白名单 zhaokaiyao@91isoft.com 2021-10-15 14:48:38 +08:00
• 8ef4f22e24 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-10-14 17:11:29 +08:00
• fec7245ec1 添加导出为excl 接口进白名单 zhaokaiyao@91isoft.com 2021-10-14 17:11:15 +08:00
• aa614a27cf Merge branch 'develop_migration' into 'develop_master' super_liu 2021-10-14 16:27:59 +08:00
• 042e6d12a5 Merge branch 'develop_master' into develop_migration super_liu 2021-10-14 16:27:22 +08:00
• 28391e6cc2 feat: There is no way the add white list super_liu 2021-10-14 16:18:51 +08:00
• f6836b0615 Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-10-14 15:14:10 +08:00
• f1ef403e56 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-10-14 15:11:16 +08:00
• 4e66ba832f 取消定时同步,手动同步加入白名单 zhaokaiyao@91isoft.com 2021-10-14 15:11:06 +08:00
• 5cd66b338c Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-10-14 14:43:20 +08:00
• 2caec798ad Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-10-14 14:41:07 +08:00
• b33d2da29d 定时用户同步,和组织机构同步 zhaokaiyao@91isoft.com 2021-10-14 14:40:54 +08:00
• 371f0cbfe8 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-10-14 09:17:17 +08:00
• 6d63592507 清单内容 yuezhihang 2021-10-14 09:17:07 +08:00
• b42992bbe2 Merge branch 'develop_3' into 'develop_master' super_liu 2021-10-13 15:55:22 +08:00
• 38ad74e9ee Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-10-13 15:49:52 +08:00
• 29ef5bafe3 commit temp zhaokaiyao@91isoft.com 2021-10-13 15:39:37 +08:00
• b47e30c9ee Merge remote-tracking branch 'origin/develop_master' into develop_master 2510220824 2021-10-13 15:36:54 +08:00
• 3fcd7e90f6 add:增加数据下发白名单 2510220824 2021-10-13 15:35:05 +08:00
• 127fb21929 Merge branch 'develop_3' into 'develop_master' super_liu 2021-10-13 15:04:44 +08:00
• a2866cf07e Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-10-13 14:59:12 +08:00
• 503523115b 国内外标准->详情->关联模块 zhaokaiyao@91isoft.com 2021-10-13 14:48:02 +08:00
• 7f39fa2447 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-10-12 17:06:15 +08:00