Commit Graph

Select branches

Hide Pull Requests

dev_20231201_feizhi

Mono Color

• d5081e56f7 Merge remote-tracking branch 'origin/develop_3' into develop_master yuezhihang 2021-09-16 09:13:34 +08:00
• dcc461e041 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-16 09:11:51 +08:00
• d6331ab155 标准详情,已被分解的的文本才有分解单按钮 zhaokaiyao@91isoft.com 2021-09-15 18:01:06 +08:00
• 180b755bec 分解单排序 zhaokaiyao@91isoft.com 2021-09-15 17:07:37 +08:00
• bcf47c93e1 查人组件 yuezhihang 2021-09-15 16:34:47 +08:00
• d11c155424 Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-09-15 09:10:56 +08:00
• ba7dd33176 未符合项整改库标准号/标准名称搜索~ Mr.Z 2021-09-14 17:40:11 +08:00
• 7100085879 Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-09-14 16:41:51 +08:00
• c4274636fb Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-09-14 15:50:38 +08:00
• b3e70132bd Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-14 15:43:29 +08:00
• 93fed98d3e Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-14 15:42:43 +08:00
• 33d084527b 导入文件路径 摒弃配置 zhaokaiyao@91isoft.com 2021-09-14 15:42:35 +08:00
• 6d39c32956 Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-14 15:13:09 +08:00
• 45da8e58d3 导入文件路径 摒弃配置设置 zhaokaiyao@91isoft.com 2021-09-14 15:11:58 +08:00
• b0c0a22906 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-14 15:09:16 +08:00
• aae27284b8 导入文件路径 zhaokaiyao@91isoft.com 2021-09-14 15:09:06 +08:00
• 8c74fa5906 Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-14 10:32:19 +08:00
• d133fefdab 注释 zhaokaiyao@91isoft.com 2021-09-13 16:09:32 +08:00
• 3f9e7205fd 使用标准表实施日期,不使用国家清单实施日期 zhaokaiyao@91isoft.com 2021-09-13 16:05:26 +08:00
• dd247c2caf 企标英文名称模糊查询 zhaokaiyao@91isoft.com 2021-09-13 15:06:07 +08:00
• 200adfcc65 导入数据时,标准类别不存在时新增 zhaokaiyao@91isoft.com 2021-09-13 09:06:47 +08:00
• fe072412d9 属性字段初始化 zhaokaiyao@91isoft.com 2021-09-10 17:40:29 +08:00
• 61be8c0aaa excl批量导入标准 添加搜索中心 zhaokaiyao@91isoft.com 2021-09-10 15:59:10 +08:00
• ea9e2b31cc excl批量导入标准 zhaokaiyao@91isoft.com 2021-09-09 23:06:19 +08:00
• 77c274b724 commit zhaokaiyao@91isoft.com 2021-09-09 22:29:34 +08:00
• 6cf59f9a45 暴力UNION 去重 zhaokaiyao@91isoft.com 2021-09-09 22:05:41 +08:00
• 3c5c0e4847 详情,实施日期多个 zhaokaiyao@91isoft.com 2021-09-09 21:04:04 +08:00
• 6aad71715c commit zhaokaiyao@91isoft.com 2021-09-09 19:44:48 +08:00
• a69f009002 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-09 19:42:15 +08:00
• 346f35f548 预警 再实施日期到达预警期限时,新车型和在产车实施日期不在预警期限,取消不显示 zhaokaiyao@91isoft.com 2021-09-09 19:39:01 +08:00
• ebf930098c Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-09-09 19:37:34 +08:00
• f6933d2cc3 程序异常解决 yuezhihang 2021-09-09 19:15:07 +08:00
• 347e3e9339 Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-09 18:05:19 +08:00
• bc4cc05f24 标准左侧数排序 zhaokaiyao@91isoft.com 2021-09-09 17:56:39 +08:00
• 5089cbb59d Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-09 17:25:45 +08:00
• 292d4c3823 标准号使用正则判断 zhaokaiyao@91isoft.com 2021-09-09 17:25:02 +08:00
• 3bc36d45d1 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-09-09 17:22:55 +08:00
• ab7e69ef39 Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-09 17:22:22 +08:00
• de8f11cadc feat: There is no way the super_liu 2021-09-09 17:18:43 +08:00
• d4dc194a79 清单 流程回退 yuezhihang 2021-09-09 16:11:09 +08:00
• bbbf101055 征求意见排序！！ yuezhihang 2021-09-09 15:31:48 +08:00
• 60e28c19dc Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-09 10:59:42 +08:00
• 0cdf343a09 standRegionalTimeDto 字段与数据库字段匹配 zhaokaiyao@91isoft.com 2021-09-09 10:59:26 +08:00
• 721f13febc 数据同步 yuezhihang 2021-09-09 10:04:42 +08:00
• 1f84c4dfea Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-09 09:09:44 +08:00
• d01cff0285 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-09-09 09:09:12 +08:00
• 1d915c30d2 自定义属性字段没有数据时,返回了null zhaokaiyao@91isoft.com 2021-09-08 22:48:22 +08:00
• 26f28b30b6 standRegionalTimeDto 属性大小写和数据字段匹配 zhaokaiyao@91isoft.com 2021-09-08 22:26:09 +08:00
• ebff8a9a74 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-08 21:09:10 +08:00
• cf32ad9580 标准详情,实施日期 s.getPutTime()空指针 zhaokaiyao@91isoft.com 2021-09-08 21:07:29 +08:00
• 39cec02fea Merge branch 'develop_migration' into 'develop_master' super_liu 2021-09-08 20:46:06 +08:00
• d9624669b1 feat: There is no way the super_liu 2021-09-08 20:17:22 +08:00
• 692feda363 Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-08 11:06:25 +08:00
• 7fab612a90 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-08 10:18:42 +08:00
• 1a03cfe68f 标准文本状态.解决无法自动废止 zhaokaiyao@91isoft.com 2021-09-08 10:17:48 +08:00
• 5d8e14befe 清单 流程回退 yuezhihang 2021-09-08 10:09:05 +08:00
• 4ced2398b2 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-09-08 09:16:20 +08:00
• 3a044912c2 Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-09-08 09:06:06 +08:00
• 7eea5b18fa Merge branch 'develop_migration' into 'develop_master' super_liu 2021-09-07 17:06:04 +08:00
• f7497d48bc feat: There is no way the #47672 super_liu 2021-09-07 17:04:53 +08:00
• 84190c9ddc 项目合规评估流程-项目 入到标准合规评估结果 里面 产品线、项目编号、项目名称没传值~~ Mr.Z 2021-09-07 16:55:28 +08:00
• 7471709e1d Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-09-07 09:52:18 +08:00
• 9729d04588 数据同步 yuezhihang 2021-09-07 09:51:59 +08:00
• 04dc576644 岗位管理新增查询功能以及分页功能~~ Mr.Z 2021-09-07 09:31:28 +08:00
• 5d56dd4151 岗位管理新增查询功能以及分页功能~~ Mr.Z 2021-09-07 09:29:23 +08:00
• 6a07bb4325 Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-07 09:28:32 +08:00
• ff66ad5fbf Merge remote-tracking branch 'origin/develop_1' into develop_1 Mr.Z 2021-09-07 09:25:02 +08:00
• 7ede6c69af commit zhaokaiyao@91isoft.com 2021-09-07 09:24:41 +08:00
• 14a7228213 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-09-07 09:22:51 +08:00
• 81a65fcf36 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-09-07 09:22:34 +08:00
• 4db5ad822f Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-07 09:18:08 +08:00
• 8f91325053 excl标准写入并导出错误excl表 zhaokaiyao@91isoft.com 2021-09-07 08:45:35 +08:00
• 02f54162d1 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-09-06 18:30:08 +08:00
• fa2417d51e Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-09-06 18:29:54 +08:00
• 446f8f54e9 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-09-06 18:29:25 +08:00
• 912cda6762 配置管理 机构管理 查询加分页 yanyizhou 2021-09-06 18:29:10 +08:00
• 0c1a57a345 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-06 18:15:17 +08:00
• 16e38bd98d excl标准写入 zhaokaiyao@91isoft.com 2021-09-06 18:14:54 +08:00
• abad09c2ea Merge branch 'develop_migration' into 'develop_master' super_liu 2021-09-06 18:02:32 +08:00
• 6683829f31 feat: There is no way the #47671 super_liu 2021-09-06 18:01:09 +08:00
• e85d3daecb feat: There is no way the #47611 super_liu 2021-09-06 17:42:34 +08:00
• 5400f5c35d Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-06 15:04:21 +08:00
• 307e6ddd85 commit zhaokaiyao@91isoft.com 2021-09-06 14:29:04 +08:00
• 465af62026 feat: There is no way the convert 4.3 super_liu 2021-09-06 13:43:44 +08:00
• 08462efc0e Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-06 09:35:25 +08:00
• 34c73432b9 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-09-06 09:29:45 +08:00
• 182b4bcf72 Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-09-06 09:29:42 +08:00
• 299c91d03e Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-09-06 09:12:50 +08:00
• a88178f1c1 Merge remote-tracking branch 'origin/develop_master' into develop_1 Mr.Z 2021-09-06 08:57:47 +08:00
• f65755b470 commit zhaokaiyao@91isoft.com 2021-09-05 10:30:54 +08:00
• cee53b3df0 commit zhaokaiyao@91isoft.com 2021-09-04 22:32:14 +08:00
• 75ef2d52bc 文本状态更新被代替,废止根据代替标准号 zhaokaiyao@91isoft.com 2021-09-04 22:29:15 +08:00
• 3146a6752d Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-04 16:44:31 +08:00
• 0ed76406b2 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-04 16:44:20 +08:00
• 92207379fc Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-09-04 16:43:36 +08:00
• b5414c7bf1 老数据 读取 yuezhihang 2021-09-04 16:43:27 +08:00
• 2e83db6d98 文本状态更新被代替,废止 zhaokaiyao@91isoft.com 2021-09-04 15:07:15 +08:00
• c48c311d3c 车型项目库的清单版本时间格式修改~~ Mr.Z 2021-09-04 11:22:37 +08:00
• 1909b24bbc Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-09-04 10:23:58 +08:00
• 28e8ba6c88 企标导出excl 标准状态->文本状态 zhaokaiyao@91isoft.com 2021-09-04 10:16:19 +08:00