Commit Graph

Select branches

Hide Pull Requests

dev_20231201_feizhi

Mono Color

• 5506e06a64 feat: There is no way the super_liu 2021-10-12 17:05:29 +08:00
• 4d6c48a85e Merge branch 'develop_migration' into 'develop_master' super_liu 2021-10-12 13:37:29 +08:00
• 08a68ced24 feat: There is no way the super_liu 2021-10-12 13:36:04 +08:00
• fda8290ca2 Merge branch 'develop_master_bak' into 'develop_master' super_liu 2021-10-11 18:09:36 +08:00
• c7f6a38694 feat: There is no way the idm and oa super_liu 2021-10-11 18:05:55 +08:00
• cf41791d0c feat: There is no way the idm and oa super_liu 2021-10-11 18:03:50 +08:00
• 3c3a199a1a feat: There is no way the idm and oa super_liu 2021-10-11 17:45:30 +08:00
• 9d36b3fa21 Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-10-11 14:32:12 +08:00
• a15d20a8be 标准合规评估结果小眼睛查询章节号排序(新增需求根据项目名称排序) Mr.Z 2021-10-09 14:49:28 +08:00
• 2ec4db856a Merge remote-tracking branch 'origin/develop_master_bak' into dev_wxh_bak super_liu 2021-10-09 14:27:14 +08:00
• bcc12aeb95 标准合规评估结果小眼睛查询章节号排序初改 Mr.Z 2021-10-09 09:31:16 +08:00
• 36df1dc472 修改实体类属性类型 zhaokaiyao@91isoft.com 2021-10-08 14:53:28 +08:00
• b4ab5a8f43 comment zhaokaiyao@91isoft.com 2021-10-08 14:52:46 +08:00
• 4def3bfe68 Merge branch 'develop_1' into 'develop_master' 张宇欢 2021-10-08 09:30:19 +08:00
• 08f19231dc Merge branch 'develop_migration' into 'develop_master' super_liu 2021-09-30 18:10:21 +08:00
• 5fc16766d9 feat: There is no way the super_liu 2021-09-30 18:09:40 +08:00
• 3388f40099 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-09-30 15:38:45 +08:00
• f093f1f31a Merge branch 'develop_master' into develop_migration super_liu 2021-09-30 15:38:07 +08:00
• 0154e41c8f Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-30 15:37:42 +08:00
• 13f8ee1feb Merge branch 'develop_master' into develop_migration super_liu 2021-09-30 15:37:21 +08:00
• d7cd16a69c feat: There is no way the super_liu 2021-09-30 15:36:39 +08:00
• fc2664079d feat: There is no way the super_liu 2021-09-29 18:03:32 +08:00
• 81c44413fe commit zhaokaiyao@91isoft.com 2021-09-29 11:15:11 +08:00
• 60060cce55 Merge branch 'develop_master' into 'dev_wangxiahui' 王夏晖 2021-09-28 18:21:07 +08:00
• 8e8bb38d07 add:增加IDM单点登录及修改服务认证 2510220824 2021-09-28 18:13:27 +08:00
• 13c7c3a3d6 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-28 17:47:11 +08:00
• bf3412e488 海外标准导出,去除文本说明 zhaokaiyao@91isoft.com 2021-09-28 17:46:23 +08:00
• ff4456e3f7 标准拆分-编辑后更改标志未1 zhaokaiyao@91isoft.com 2021-09-28 17:19:24 +08:00
• e7ff4862ed Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-28 16:53:16 +08:00
• d2870231ea 标准拆分-文件类型动态查询 zhaokaiyao@91isoft.com 2021-09-28 16:48:48 +08:00
• 7e0d3b59b1 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-28 15:18:33 +08:00
• aa5e7004dc Merge remote-tracking branch 'origin/develop_master' into develop_1 Mr.Z 2021-09-28 10:52:29 +08:00
• 516f32cb43 Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-28 10:47:16 +08:00
• 2c4ff91c4f 部门为"null"的数据不保存 zhaokaiyao@91isoft.com 2021-09-28 10:07:29 +08:00
• 0a006671cc Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-28 09:04:52 +08:00
• 4e2278a987 机构树形排序 zhaokaiyao@91isoft.com 2021-09-28 08:58:23 +08:00
• f3b8466c5f 同步用户空指针 zhaokaiyao@91isoft.com 2021-09-28 08:57:55 +08:00
• 87337c1374 查询人 接口 yuezhihang 2021-09-27 19:47:15 +08:00
• ee340ad056 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-09-27 19:45:26 +08:00
• 58fc669581 Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-09-27 17:26:53 +08:00
• 4584b06a42 未符合项整改-导出 字段显示有问题 yanyizhou 2021-09-27 17:26:48 +08:00
• 04a07687c6 标准法规清单查询 Mr.Z 2021-09-27 17:11:07 +08:00
• 0630c99b0b 添加条款内容传给前端 Mr.Z 2021-09-27 16:33:59 +08:00
• 21372dbaa4 Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-09-27 14:52:53 +08:00
• ae1f05c000 标准法规清单-编辑-导出 删除这些字段 yanyizhou 2021-09-27 14:52:48 +08:00
• 2991806086 联表查询 dicstandTextStatus zhaokaiyao@91isoft.com 2021-09-27 14:05:51 +08:00
• 3eed899c34 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-27 13:54:24 +08:00
• ce7812e704 把 standtextStatusShow改为了standTextStatusShow zhaokaiyao@91isoft.com 2021-09-27 13:54:14 +08:00
• 44b33c39d3 Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-27 13:43:25 +08:00
• 2556ddcc0b 在基础字段中去除了适用产品线和责任工程师 因为在attr中已存在 zhaokaiyao@91isoft.com 2021-09-27 13:39:43 +08:00
• fd2d58c25f 添加了连接查询文本状态显示值 zhaokaiyao@91isoft.com 2021-09-27 10:44:38 +08:00
• 447d56231a group by中添加字段dicstandNature.DIC_TYPE_NAME zhaokaiyao@91isoft.com 2021-09-27 10:33:37 +08:00
• 50a4b7284a Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-27 10:20:00 +08:00
• d9d5aeb284 标准导出 zhaokaiyao@91isoft.com 2021-09-27 10:13:13 +08:00
• 7c961a92a2 feat: There is no way the searchCenter super_liu 2021-09-23 15:29:02 +08:00
• 031cbf9611 feat: There is no way the super_liu 2021-09-22 17:30:37 +08:00
• 35f49e1528 导出排序（按照章节号从小到大） Mr.Z 2021-09-27 09:43:27 +08:00
• 108b718091 导出排序（按照章节号从小到大） Mr.Z 2021-09-26 17:50:48 +08:00
• 9b47219f07 Merge remote-tracking branch 'origin/develop_1' into develop_1 Mr.Z 2021-09-26 17:33:47 +08:00
• b064503b3c 导出排序（按照章节号从小到大） Mr.Z 2021-09-26 17:33:16 +08:00
• d2ad6b174c 配置管理-机构管理-操作-禁用 点击后 无提示 无效果 yanyizhou 2021-09-26 14:48:20 +08:00
• 22027d9e7c Merge remote-tracking branch 'origin/develop_1' into develop_1 Mr.Z 2021-09-26 13:48:47 +08:00
• 30c2b5de44 配置管理-机构管理 输入检索条件 查询 有12条 但是显示25条 25条是所有的数据数 yanyizhou 2021-09-26 10:34:07 +08:00
• ddaf6d7d2b Merge branch 'develop_migration' into 'develop_master' super_liu 2021-09-23 15:38:58 +08:00
• e3780efdf5 Merge branch 'develop_master' into develop_migration super_liu 2021-09-23 15:31:01 +08:00
• 898f510868 feat: There is no way the searchCenter super_liu 2021-09-23 15:29:02 +08:00
• c7e3c97339 国内外标准--如果清单下挂着标准A，在标准库里删除标准A的话，加个验证 不让删这个标准 yanyizhou 2021-09-23 15:17:41 +08:00
• 8e2d3c7697 Merge remote-tracking branch 'origin/develop_master' into develop_1 Mr.Z 2021-09-23 14:00:35 +08:00
• 8dd5ed9230 Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-09-23 09:15:42 +08:00
• 215653505b Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-09-23 08:36:52 +08:00
• 5d1e39fa32 分解单->关联条款 zhaokaiyao@91isoft.com 2021-09-23 01:12:51 +08:00
• 52f49021bd Merge branch 'develop_migration' into 'develop_master' super_liu 2021-09-22 17:35:51 +08:00
• 179ecebd76 Merge branch 'develop_master' into develop_migration super_liu 2021-09-22 17:34:01 +08:00
• 86555259a0 feat: There is no way the super_liu 2021-09-22 17:30:37 +08:00
• 2b9b039a48 拉取master Mr.Z 2021-09-22 16:52:13 +08:00
• 8c749b2f84 拉取master Mr.Z 2021-09-22 16:51:02 +08:00
• 90f025fc03 Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-22 16:32:35 +08:00
• d4a293cbef 标准详情->分解单->排序split_pid函数 zhaokaiyao@91isoft.com 2021-09-22 16:26:02 +08:00
• e777d18044 Merge remote-tracking branch 'origin/develop_master' into develop_1 Mr.Z 2021-09-22 09:45:04 +08:00
• bbfcbae5a0 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-09-17 09:42:15 +08:00
• de61789265 Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-09-17 09:40:27 +08:00
• 0ccbc5cacf Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-17 09:34:59 +08:00
• 76b61d5d07 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-17 09:32:25 +08:00
• 7bc2d8124a 首页->标准发布->实施日期和发布日期比较时的日期格式 zhaokaiyao@91isoft.com 2021-09-17 09:31:52 +08:00
• e8d901bb2f 分解单搜索问题~ Mr.Z 2021-09-16 20:11:23 +08:00
• 07a5ca6fc2 Merge remote-tracking branch 'origin/develop_3' into develop_master yuezhihang 2021-09-16 20:06:40 +08:00
• 69d5a15ce4 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-09-16 20:06:03 +08:00
• 4d598a76a2 标准解读 章节1 展示 yuezhihang 2021-09-16 20:05:48 +08:00
• e7e3848108 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-16 20:04:09 +08:00
• fe0a0f7dbe 国内外标准 实施日期排序 程序异常 group by问题 zhaokaiyao@91isoft.com 2021-09-16 20:03:40 +08:00
• ccf7d32945 首页标准发布 只查询文本状态为即将实施的数据 zhaokaiyao@91isoft.com 2021-09-16 19:27:36 +08:00
• 66faec58e0 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-09-16 17:15:52 +08:00
• 2878ca491a feat: There is no way the super_liu 2021-09-16 17:14:33 +08:00
• 3eb2ddce1e 分解单默认升序排序 zhaokaiyao@91isoft.com 2021-09-16 16:47:03 +08:00
• 881055c810 Merge branch 'develop_master' into develop_migration super_liu 2021-09-16 15:02:39 +08:00
• 9e392bf904 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-09-16 15:00:23 +08:00
• 6e88f37c28 项目评估流程排序问题 yuezhihang 2021-09-16 15:00:14 +08:00
• 97ebfb6f6a feat: There is no way the super_liu 2021-09-16 14:56:39 +08:00
• 44ba80e050 解决了标准预警,条款预警标准号显示为null的问题 zhaokaiyao@91isoft.com 2021-09-16 10:48:19 +08:00
• e195fbc416 Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-16 09:15:15 +08:00