Commit Graph

Select branches

Hide Pull Requests

dev_20231201_feizhi

Mono Color

• 591701697d Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-27 09:04:55 +08:00
• 5fe1295f0e Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-08-27 09:04:51 +08:00
• 07bd24b7cf 标准拆分的批量删除与编辑~~ Mr.Z 2021-08-26 20:44:51 +08:00
• 6aeb9b91ac 公开征求意见 yuezhihang 2021-08-26 14:25:12 +08:00
• 7b940f7c91 配置 yuezhihang 2021-08-26 13:56:12 +08:00
• 6c94bcb070 首页征求意见倒序 yuezhihang 2021-08-26 13:55:21 +08:00
• 120ee599b7 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-08-26 13:54:35 +08:00
• 19ed562068 首页 征求意见倒序排序 yuezhihang 2021-08-26 13:54:24 +08:00
• ce67c016cd Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-26 11:21:48 +08:00
• 4eb9e91554 Merge branch 'develop_master' into develop_1 Mr.Z 2021-08-26 11:15:54 +08:00
• f9703387b9 Merge branch 'develop_3' into 'develop_master' super_liu 2021-08-26 02:38:50 +00:00
• bab79aec98 定时时间 zhaokaiyao@91isoft.com 2021-08-26 10:32:47 +08:00
• 6ada02e26d Merge branch 'develop_master' into develop_1 Mr.Z 2021-08-26 10:27:59 +08:00
• 2f4ca61144 Merge branch 'develop_3' into 'develop_master' super_liu 2021-08-26 02:27:07 +00:00
• 6e0091f875 标准预警 zhaokaiyao@91isoft.com 2021-08-26 10:23:02 +08:00
• 426ff38355 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-08-26 10:22:15 +08:00
• ca84264193 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-08-26 09:42:57 +08:00
• ee0eac6ae0 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-08-25 09:21:30 +00:00
• 71aba6aa2d feat: There is no way the super_liu 2021-08-25 17:20:45 +08:00
• dbac199130 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-25 17:03:28 +08:00
• 74167d2d76 Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-08-25 17:03:20 +08:00
• 51055e0374 不一致项 查询 加standType yanyizhou 2021-08-25 17:02:59 +08:00
• 4dd609cd75 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-08-25 07:32:17 +00:00
• b2884bac9d feat: There is no way the delResourceById super_liu 2021-08-25 15:23:55 +08:00
• fe25f43063 合并代码冲突 yanyizhou 2021-08-25 15:17:55 +08:00
• a828f41d20 征求意见流程导出bug修改~~ Mr.Z 2021-08-25 15:16:14 +08:00
• a5ad8077d4 注释 zhaokaiyao@91isoft.com 2021-08-25 14:24:42 +08:00
• a3c056cbbf Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-08-25 13:36:49 +08:00
• 2551cb416e Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-25 13:36:06 +08:00
• 67dab85275 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-08-25 02:59:36 +00:00
• 2d3762e6ef Merge branch 'develop_master' into develop_migration super_liu 2021-08-25 10:58:07 +08:00
• 0fff17b230 feat: There is no way the All Filed super_liu 2021-08-25 10:54:33 +08:00
• 81799abfb1 add:修改ocr回调文件存储 2510220824 2021-08-25 09:22:45 +08:00
• 98e930868a Merge branch 'develop_migration' into 'develop_master' super_liu 2021-08-24 09:32:42 +00:00
• 94612430d1 Merge branch 'develop_3' into 'develop_master' super_liu 2021-08-24 09:32:13 +00:00
• 590165a3c8 Merge branch 'develop_master' into develop_migration super_liu 2021-08-24 17:31:22 +08:00
• 02a8b6c969 feat: There is no way the ES BUSS super_liu 2021-08-24 17:29:53 +08:00
• 65a7e634d4 分界单进入之前先删除 yuezhihang 2021-08-24 17:14:20 +08:00
• d5d885651b 新增自定义属性后,重新加载数据 zhaokaiyao@91isoft.com 2021-08-24 16:44:37 +08:00
• 14b4a2f35c Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-08-24 16:03:08 +08:00
• 083dd6aab5 Merge remote-tracking branch 'origin/develop_3' into develop_3 zhaokaiyao@91isoft.com 2021-08-24 16:02:33 +08:00
• 1e2c09a610 预警显示的数据在系统日期之后 zhaokaiyao@91isoft.com 2021-08-24 16:02:18 +08:00
• 78dbd37f03 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-08-24 15:34:27 +08:00
• c65edcbaab 成球意见详情导出格式bug修改~~ Mr.Z 2021-08-24 15:30:43 +08:00
• 97cec30f4d Merge remote-tracking branch 'origin/develop_master' into develop_master 2510220824 2021-08-24 14:24:40 +08:00
• 5d7f3195e3 add:修改restTemplate配置 2510220824 2021-08-24 14:24:14 +08:00
• 0d5f369597 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-24 13:52:10 +08:00
• 150e6f8676 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-08-24 05:43:32 +00:00
• 052222a52f Merge branch 'develop_master' into develop_migration super_liu 2021-08-24 13:42:22 +08:00
• a971d3bcf7 feat: There is no way the super_liu 2021-08-24 13:40:45 +08:00
• 7423ae7371 Merge branch 'develop_3' into 'develop_master' super_liu 2021-08-24 05:39:33 +00:00
• ad5a7629b7 Merge branch 'develop_master' into develop_3 super_liu 2021-08-24 13:38:39 +08:00
• 57a3e082d3 feat: There is no way the super_liu 2021-08-24 13:37:36 +08:00
• f58bbd0c01 Merge remote-tracking branch 'origin/develop_master' into develop_master 2510220824 2021-08-24 13:32:42 +08:00
• bf8a247cf2 add:ocr请求替换为okhttp 2510220824 2021-08-24 13:30:39 +08:00
• f1a64d1b75 Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-08-24 11:24:13 +08:00
• 3d9952df59 Merge branch 'develop_master' into develop_1 Mr.Z 2021-08-24 11:05:07 +08:00
• 6e9cf7adf4 车型项目库数据传递bug修改~~ Mr.Z 2021-08-24 11:01:32 +08:00
• fcbe5647e7 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-24 10:35:26 +08:00
• d1288190dd Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-24 10:22:39 +08:00
• fd063ba732 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-08-24 02:09:50 +00:00
• 0c8fb2b03f feat: There is no way the super_liu 2021-08-24 10:09:07 +08:00
• 30e540f472 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-08-24 01:59:07 +00:00
• 6084f51bae feat: There is no way the super_liu 2021-08-24 09:57:11 +08:00
• b33dc11538 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-24 09:16:41 +08:00
• fe7795ee61 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-24 09:07:35 +08:00
• 836f62172c Merge branch 'develop_migration' into 'develop_master' super_liu 2021-08-23 09:56:29 +00:00
• 4a11cd9c9b Merge branch 'develop_master' into develop_migration super_liu 2021-08-23 17:55:37 +08:00
• 316fde8563 feat: There is no way the Buss advanced query super_liu 2021-08-23 17:48:44 +08:00
• 6f06ed7157 Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-08-23 15:55:03 +08:00
• b17409a7ae 项目评估结果tab页下的查看页面，点击查询按钮，提示程序异常 yanyizhou 2021-08-23 15:53:56 +08:00
• e92b03a295 Merge branch 'develop_1' into 'develop_master' 张宇欢 2021-08-23 07:13:20 +00:00
• eb264da8f6 合并DM到D1~~~~ Mr.Z 2021-08-23 15:03:04 +08:00
• c2039807da Merge branch 'develop_migration' into 'develop_master' super_liu 2021-08-23 06:47:50 +00:00
• 74d7f48722 Merge branch 'develop_3' into 'develop_master' super_liu 2021-08-23 06:47:12 +00:00
• d94b03b05a 车型项目库回显bug(T_T)~~~~ Mr.Z 2021-08-23 14:46:09 +08:00
• 38f4fc3674 feat: There is no way the Buss export and delete es index super_liu 2021-08-23 14:43:58 +08:00
• 2b8b536811 Merge remote-tracking branch 'origin/develop_1' into develop_1 Mr.Z 2021-08-23 13:37:48 +08:00
• 52503aa715 解决了newListMethod() 新增标准清单添加标准问题 zhaokaiyao@91isoft.com 2021-08-23 13:15:52 +08:00
• 8f53c85efc 标准法规清单-国家/地区清单修改提示信息 yanyizhou 2021-08-23 11:04:25 +08:00
• c223de4c32 Merge remote-tracking branch 'origin/develop_1' into develop_3 zhaokaiyao@91isoft.com 2021-08-23 10:59:03 +08:00
• 67dc9c829a Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-23 09:47:05 +08:00
• af0112e2dd latest zhaokaiyao@91isoft.com 2021-08-22 20:32:35 +08:00
• 95e2316a99 海外标准法规-假设标准A的国家地区选择中国，国家地区清单tab页下的中国的清单里要自动归档标准A的数据 zhaokaiyao@91isoft.com 2021-08-21 23:28:54 +08:00
• 23365ffa16 标准拆分，拆分之后分解单里也有数据 yanyizhou 2021-08-20 21:50:40 +08:00
• a242b9ac56 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-08-20 10:12:39 +00:00
• fe89ba9c60 feat: There is no way the Buss and Convert super_liu 2021-08-20 18:12:08 +08:00
• 27e72dca2e 征求意见 数据 yuezhihang 2021-08-20 17:49:34 +08:00
• e4c66d74a2 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-08-20 15:20:54 +08:00
• dcfedac4bf 标准征求意见流程汇总 yuezhihang 2021-08-20 15:20:33 +08:00
• 1363a5b5af Merge branch 'develop_3' into 'develop_master' super_liu 2021-08-20 07:06:16 +00:00
• aaa9598735 feat: There is no way the !!! super_liu 2021-08-20 15:05:24 +08:00
• ebfde8bd52 定时标准预警 zhaokaiyao@91isoft.com 2021-08-20 14:33:29 +08:00
• 944df917a3 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-08-20 06:14:10 +00:00
• c89a90757c Merge branch 'develop_master' into develop_migration super_liu 2021-08-20 14:09:13 +08:00
• d176d93d6b feat: There is no way the Buss and Convert super_liu 2021-08-20 14:07:37 +08:00
• cec843270f Merge remote-tracking branch 'origin/develop_3' into develop_3 zhaokaiyao@91isoft.com 2021-08-20 12:19:22 +08:00
• 38690f92b6 Merge remote-tracking branch 'origin/develop_master' into develop_master super_liu 2021-08-20 12:01:15 +08:00
• 4abeb55cf3 feat: There is no way the scheduled conf super_liu 2021-08-20 12:00:56 +08:00
• afe965d44e Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-08-20 10:57:25 +08:00