Commit Graph

Select branches

Hide Pull Requests

dev_20231201_feizhi

Mono Color

• 19c52a212b 解决企标高级搜索,putTime,issuTime,textStatusBuss失效的问题 zhaokaiyao@91isoft.com 2021-09-04 10:09:40 +08:00
• da7826f004 企标excl导出 日期出现异常 zhaokaiyao@91isoft.com 2021-09-04 10:07:44 +08:00
• e405a811b8 Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-09-04 09:50:49 +08:00
• 7ba6efe95f Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-09-03 17:25:18 +08:00
• 1f2d738ee3 机构管理--加筛选条件：姓名和邮箱 yanyizhou 2021-09-03 17:24:59 +08:00
• 08c19dd1f4 /api/sarStandProjectLibrary/save 接口 yanyizhou 2021-09-03 10:47:37 +08:00
• 8ce701cc82 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-09-03 09:24:42 +08:00
• fcc74a17dc save sar_stand_project_team zhaokaiyao@91isoft.com 2021-09-03 09:12:58 +08:00
• 0b97292bca 实现 /api/sarStandProjectLibrary/save 接口 yanyizhou 2021-09-02 22:55:43 +08:00
• 42491993a6 Merge remote-tracking branch 'origin/develop_3' into develop_1 yanyizhou 2021-09-02 21:22:45 +08:00
• 4acf662b1a Merge remote-tracking branch 'origin/develop_1' into develop_3 zhaokaiyao@91isoft.com 2021-09-02 21:21:25 +08:00
• 1033aecfa4 Merge remote-tracking branch 'origin/develop_3' into develop_1 yanyizhou 2021-09-02 21:20:45 +08:00
• b72ed741f0 Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-09-02 21:20:16 +08:00
• 9251c7a28b Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-02 21:07:17 +08:00
• e8dd9f42cb save sar_stand_project_team zhaokaiyao@91isoft.com 2021-09-02 21:06:40 +08:00
• ae1c70b140 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-09-02 17:31:44 +08:00
• 0e8238267c 车型项目库的清单版本~~ Mr.Z 2021-09-02 17:29:19 +08:00
• 93795007e7 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-09-02 08:58:05 +00:00
• a8158890c1 Merge branch 'develop_master' into develop_migration super_liu 2021-09-02 16:57:24 +08:00
• a94b3bea68 feat: There is no way the super_liu 2021-09-02 16:54:04 +08:00
• 7d0c3a3a9a Merge remote-tracking branch 'origin/develop_master' into develop_1 Mr.Z 2021-09-02 16:49:29 +08:00
• 5c246ba9b4 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-09-02 16:44:15 +08:00
• 18cda2c469 Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-02 08:43:02 +00:00
• 5fdf3fa9ae Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-09-02 16:30:12 +08:00
• 46a85a54ae Merge branch 'develop_migration' into 'develop_master' super_liu 2021-09-02 07:23:45 +00:00
• f8de6d895f feat: There is no way the super_liu 2021-09-02 15:21:45 +08:00
• cb2090fc44 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-09-02 10:45:27 +08:00
• 3d5abafdb0 查询文本信息2.0 zhaokaiyao@91isoft.com 2021-09-02 10:43:11 +08:00
• 2e6edf615b 标准预警修改~~ Mr.Z 2021-09-02 10:17:28 +08:00
• 0e4d7b6a32 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-09-02 09:36:04 +08:00
• 2ec116944c feat: There is no way the ocr handle url super_liu 2021-09-01 17:01:19 +08:00
• ee85f48542 开耀和宇欢冲突之后的合并代码 yanyizhou 2021-09-01 14:25:16 +08:00
• fc608845d8 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-09-01 11:19:57 +08:00
• e86f5cfbe7 Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-09-01 11:12:29 +08:00
• 9f7f95431c Merge branch 'develop_3' into 'develop_master' super_liu 2021-09-01 02:58:01 +00:00
• c60ba3c14e Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-08-31 21:39:44 +08:00
• f48869a1d5 标准预警,判断标准在产车实施日期和新车型实施日期是否在预警期限内 zhaokaiyao@91isoft.com 2021-08-31 21:39:18 +08:00
• ea473ee500 feat: There is no way the ocr super_liu 2021-08-31 18:02:50 +08:00
• 41bef317c7 feat: There is no way the super_liu 2021-08-31 16:43:41 +08:00
• 431acef2b1 Merge remote-tracking branch 'origin/develop_master' into develop_master super_liu 2021-08-31 16:40:43 +08:00
• a1505cb120 feat: There is no way the convert super_liu 2021-08-31 16:40:29 +08:00
• 4277e819f2 因排序导致无法去重 yuezhihang 2021-08-31 16:12:29 +08:00
• a843354794 预警标准时设itemsId为'-1' 更改唯一性约束 zhaokaiyao@91isoft.com 2021-08-31 14:47:54 +08:00
• 8040cc0711 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-08-31 14:04:42 +08:00
• 02dc65167e 对实施日期进行预警.更新对条款的预警,加入使用车型和责任工程师 zhaokaiyao@91isoft.com 2021-08-31 14:04:28 +08:00
• 4204771472 标准预警初次修改~~ Mr.Z 2021-08-31 14:03:26 +08:00
• bb378b56a7 新添文本信息接口 zhaokaiyao@91isoft.com 2021-08-31 14:01:07 +08:00
• 05a77b34a0 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-31 11:18:09 +08:00
• 1ef143e71f 标准查询 标准号/标准姓名 ！！！ yuezhihang 2021-08-31 10:49:04 +08:00
• fdd7fe18c0 清单查询失效问题 yuezhihang 2021-08-31 10:29:29 +08:00
• e706eaea22 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-30 18:07:00 +08:00
• 1739a3d555 标准预警--加筛选条件 优化了代码（之前查询条件只有一个，所以传的string，现在有很多个，所以传了一个bean，我就把之前传的string那部分代码删了）希望人没事 yanyizhou 2021-08-30 18:06:47 +08:00
• de17b97ad9 标准预警--加筛选条件 yanyizhou 2021-08-30 17:56:27 +08:00
• 7ad71e5e6a Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-08-30 17:50:50 +08:00
• 900437039d 项目清单确认流程 yuezhihang 2021-08-30 17:50:45 +08:00
• 770b0b1b8a feat: There is no way the super_liu 2021-08-30 16:46:03 +08:00
• 74fd462657 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-08-30 08:25:31 +00:00
• 455b58fffb feat: There is no way the super_liu 2021-08-30 16:21:17 +08:00
• 00a19e76ba Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-30 15:26:10 +08:00
• e443ee6164 标准合规评估结果--技术评估结果 查看里面的查询条件更改为标准号/标准名称和具体章条 yanyizhou 2021-08-30 15:25:54 +08:00
• 1312813fca Merge branch 'develop_migration' into 'develop_master' super_liu 2021-08-30 07:11:47 +00:00
• a57693fd39 Merge branch 'develop_master' into develop_migration super_liu 2021-08-30 15:11:00 +08:00
• 99c32a2d7f feat: There is no way the convert super_liu 2021-08-30 15:08:55 +08:00
• 73885d444e Merge branch 'develop_3' into 'develop_master' super_liu 2021-08-30 04:42:48 +00:00
• b7ccbbfc45 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-30 10:34:17 +08:00
• f53cdd885b 更新定时任务时间 zhaokaiyao@91isoft.com 2021-08-30 10:03:03 +08:00
• 56e62ac041 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-08-30 09:56:54 +08:00
• 2fb1faacfa 标准预警,标准文本状态自动更新 zhaokaiyao@91isoft.com 2021-08-30 09:48:35 +08:00
• 88cb99ad9b Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-08-30 09:05:14 +08:00
• 913fc6e8f5 国内外标准详情 分解单日期格式和条款名称模糊查询 zhaokaiyao@91isoft.com 2021-08-29 19:17:41 +08:00
• 4c6cffa061 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-08-27 10:02:01 +00:00
• dd2fccc289 Merge branch 'develop_master' into develop_migration super_liu 2021-08-27 18:01:18 +08:00
• d679b48299 feat: There is no way the linux convert path super_liu 2021-08-27 18:00:24 +08:00
• 46978c9fdb Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-08-27 17:44:02 +08:00
• 75888c8fa0 首页 结束时间正序 yuezhihang 2021-08-27 17:43:56 +08:00
• af428949a8 之前被覆盖的修改二次提交(；′⌒`)~~ Mr.Z 2021-08-27 17:33:06 +08:00
• 1b38560d9f Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-27 16:32:00 +08:00
• 0b75b7cea5 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-08-27 08:20:06 +00:00
• 7155dea894 Merge branch 'develop_master' into develop_migration super_liu 2021-08-27 16:18:54 +08:00
• 531137fa86 feat: There is no way the super_liu 2021-08-27 16:18:03 +08:00
• d66fcc1ad1 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-08-27 15:30:35 +08:00
• 73588cac91 需求 解读流程 最细条目 yuezhihang 2021-08-27 14:43:47 +08:00
• 349fa7e499 标准拆分的批量删除与编辑~~ Mr.Z 2021-08-26 20:44:51 +08:00
• 9b9ebabe6b 公开征求意见 yuezhihang 2021-08-26 14:25:12 +08:00
• 653fd06d50 配置 yuezhihang 2021-08-26 13:56:12 +08:00
• 59f77d802c 首页征求意见倒序 yuezhihang 2021-08-26 13:55:21 +08:00
• 7ff86124b7 首页 征求意见倒序排序 yuezhihang 2021-08-26 13:54:24 +08:00
• baa674136b 征求意见流程导出bug修改~~ Mr.Z 2021-08-25 15:16:14 +08:00
• 87f3c15a7b 不一致项 查询 加standType yanyizhou 2021-08-25 17:02:59 +08:00
• 3070ec5e59 合并代码冲突 yanyizhou 2021-08-25 15:17:55 +08:00
• c22db5b063 定时任务-修改文本状态 zhaokaiyao@91isoft.com 2021-08-27 15:24:32 +08:00
• 6148add390 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-27 14:54:57 +08:00
• 87a6ff319d Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-08-27 14:54:37 +08:00
• 003315dde8 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-08-27 14:44:07 +08:00
• 9185ef2b6a 需求 解读流程 最细条目 yuezhihang 2021-08-27 14:43:47 +08:00
• 016e7e9003 修改预警时间 zhaokaiyao@91isoft.com 2021-08-27 11:29:15 +08:00
• cf60309f2b 标准预警标准编号与名称跳页~~ Mr.Z 2021-08-27 11:26:32 +08:00
• 8cf4fec559 标准预警标准编号与名称跳页~~ Mr.Z 2021-08-27 11:25:17 +08:00
• 05994c6014 标准预警标准编号与名称跳页~~ Mr.Z 2021-08-27 11:24:27 +08:00
• 638a988a9d Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-08-27 09:23:22 +08:00