FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
751 Commits 1 Branch 0 Tags
0b75b7cea57ec5e18b1e4e153fb8daf922543f5c
Commit Graph
751 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
super_liu 0b75b7cea5 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request !137
 2021-08-27 08:20:06 +00:00
super_liu 7155dea894 Merge branch 'develop_master' into develop_migration 2021-08-27 16:18:54 +08:00
super_liu 531137fa86 feat: There is no way the 2021-08-27 16:18:03 +08:00
yuezhihang 003315dde8 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-27 14:44:07 +08:00
yuezhihang 9185ef2b6a 需求 解读流程 最细条目 2021-08-27 14:43:47 +08:00
Mr.Z cf60309f2b 标准预警标准编号与名称跳页~~ 2021-08-27 11:26:32 +08:00
Mr.Z 8cf4fec559 标准预警标准编号与名称跳页~~ 2021-08-27 11:25:17 +08:00
Mr.Z 05994c6014 标准预警标准编号与名称跳页~~ 2021-08-27 11:24:27 +08:00
yuezhihang 638a988a9d Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-27 09:23:22 +08:00
Mr.Z 07bd24b7cf 标准拆分的批量删除与编辑~~ 2021-08-26 20:44:51 +08:00
yuezhihang 6aeb9b91ac 公开征求意见 2021-08-26 14:25:12 +08:00
yuezhihang 7b940f7c91 配置 2021-08-26 13:56:12 +08:00
yuezhihang 6c94bcb070 首页征求意见倒序 2021-08-26 13:55:21 +08:00
yuezhihang 120ee599b7 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-26 13:54:35 +08:00
yuezhihang 19ed562068 首页 征求意见倒序排序 2021-08-26 13:54:24 +08:00
Mr.Z 4eb9e91554 Merge branch 'develop_master' into develop_1 2021-08-26 11:15:54 +08:00
super_liu f9703387b9 Merge branch 'develop_3' into 'develop_master' 
定时时间

See merge request !136
 2021-08-26 02:38:50 +00:00
zhaokaiyao@91isoft.com bab79aec98 定时时间 2021-08-26 10:32:47 +08:00
Mr.Z 6ada02e26d Merge branch 'develop_master' into develop_1 2021-08-26 10:27:59 +08:00
super_liu 2f4ca61144 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !135
 2021-08-26 02:27:07 +00:00
zhaokaiyao@91isoft.com 6e0091f875 标准预警 2021-08-26 10:23:02 +08:00
zhaokaiyao@91isoft.com 426ff38355 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-08-26 10:22:15 +08:00
yuezhihang ca84264193 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-26 09:42:57 +08:00
super_liu ee0eac6ae0 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the

See merge request !134
 2021-08-25 09:21:30 +00:00
super_liu 71aba6aa2d feat: There is no way the 2021-08-25 17:20:45 +08:00
yanyizhou dbac199130 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-25 17:03:28 +08:00
yanyizhou 74167d2d76 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-25 17:03:20 +08:00
yanyizhou 51055e0374 不一致项 查询 加standType 2021-08-25 17:02:59 +08:00
super_liu 4dd609cd75 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the delResourceById

See merge request !133
 2021-08-25 07:32:17 +00:00
super_liu b2884bac9d feat: There is no way the delResourceById 2021-08-25 15:23:55 +08:00
yanyizhou fe25f43063 合并代码冲突 2021-08-25 15:17:55 +08:00
Mr.Z a828f41d20 征求意见流程导出bug修改~~ 2021-08-25 15:16:14 +08:00
zhaokaiyao@91isoft.com a5ad8077d4 注释 2021-08-25 14:24:42 +08:00
yanyizhou a3c056cbbf Merge remote-tracking branch 'origin/develop_1' into develop_1 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
 2021-08-25 13:36:49 +08:00
yanyizhou 2551cb416e Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-25 13:36:06 +08:00
super_liu 67dab85275 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request !132
 2021-08-25 02:59:36 +00:00
super_liu 2d3762e6ef Merge branch 'develop_master' into develop_migration 2021-08-25 10:58:07 +08:00
super_liu 0fff17b230 feat: There is no way the All Filed 2021-08-25 10:54:33 +08:00
2510220824 81799abfb1 add:修改ocr回调文件存储 2021-08-25 09:22:45 +08:00
super_liu 98e930868a Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request !131
 2021-08-24 09:32:42 +00:00
super_liu 94612430d1 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !130
 2021-08-24 09:32:13 +00:00
super_liu 590165a3c8 Merge branch 'develop_master' into develop_migration 2021-08-24 17:31:22 +08:00
super_liu 02a8b6c969 feat: There is no way the ES BUSS 2021-08-24 17:29:53 +08:00
yuezhihang 65a7e634d4 分界单进入之前先删除 2021-08-24 17:14:20 +08:00
zhaokaiyao@91isoft.com d5d885651b 新增自定义属性后,重新加载数据 2021-08-24 16:44:37 +08:00
zhaokaiyao@91isoft.com 14b4a2f35c Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-08-24 16:03:08 +08:00
zhaokaiyao@91isoft.com 083dd6aab5 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-08-24 16:02:33 +08:00
zhaokaiyao@91isoft.com 1e2c09a610 预警显示的数据在系统日期之后 2021-08-24 16:02:18 +08:00
yuezhihang 78dbd37f03 Merge remote-tracking branch 'origin/develop_1' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
 2021-08-24 15:34:27 +08:00
Mr.Z c65edcbaab 成球意见详情导出格式bug修改~~ 2021-08-24 15:30:43 +08:00