wangliwen
|
9b0cbc88e6
|
Merge branch 'master' into docker_package
|
2022-07-22 17:54:29 +08:00 |
|
wangliwen
|
51ab0f7c78
|
屮
|
2022-07-22 17:54:17 +08:00 |
|
wangliwen
|
762dccbb91
|
Merge branch 'master' into docker_package
|
2022-07-22 17:35:50 +08:00 |
|
wangliwen
|
47e873ecab
|
。。。
|
2022-07-22 17:35:29 +08:00 |
|
wangliwen
|
488b42719f
|
Merge branch 'master' into docker_package
|
2022-07-22 17:21:58 +08:00 |
|
wangliwen
|
573c55687c
|
能力详情出是否通过
|
2022-07-22 17:21:45 +08:00 |
|
wangliwen
|
5092055091
|
Merge branch 'master' into docker_package
|
2022-07-22 17:14:03 +08:00 |
|
wangliwen
|
aad23ca5ee
|
资源详情返回 是否加入申购车
|
2022-07-22 17:11:21 +08:00 |
|
wangliwen
|
0d6347c964
|
Merge branch 'master' into docker_package
|
2022-07-22 16:47:50 +08:00 |
|
wangliwen
|
676a1d2e17
|
是否为基础设施的判断
|
2022-07-22 16:47:32 +08:00 |
|
wangliwen
|
555c023476
|
Merge branch 'master' into docker_package
|
2022-07-22 16:11:40 +08:00 |
|
wangliwen
|
4a4d21bf87
|
Merge remote-tracking branch '备份/dev' into dev
|
2022-07-22 16:11:22 +08:00 |
|
wangliwen
|
373af4ba93
|
Merge remote-tracking branch '备份/dev' into docker_package
|
2022-07-22 16:10:43 +08:00 |
|
wangliwen
|
888e148fb4
|
。。。
|
2022-07-22 16:10:33 +08:00 |
 yitonglei
|
72cf26ec72
|
1、能力集市-基础设施页面的列表查询的sql语句增加 check_status 为空的判断
|
2022-07-22 16:06:44 +08:00 |
|
wangliwen
|
fe3c6bb939
|
Merge branch 'master' into docker_package
|
2022-07-22 15:45:47 +08:00 |
|
wangliwen
|
6c06060b16
|
Merge branch 'master' into dev
|
2022-07-22 15:45:34 +08:00 |
|
wangliwen
|
aa54a9a8fc
|
pageWithAttr增加是否加入申购车
|
2022-07-22 15:45:11 +08:00 |
 dinggang
|
81b5b28743
|
1.修复金宏环境-能力统计-资源图谱-能力类型-能力集-按照数据资源查数据接口调用错误
|
2022-07-22 14:43:04 +08:00 |
|
wangliwen
|
0dc2b4eac3
|
Merge branch 'master' into docker_package
|
2022-07-22 13:32:40 +08:00 |
|
wangliwen
|
c950efc96e
|
已办流程查询流程内参数
|
2022-07-22 13:32:23 +08:00 |
|
wangliwen
|
05d77742d1
|
Merge branch 'master' into docker_package
|
2022-07-22 12:04:36 +08:00 |
|
yitonglei
|
375d482ce2
|
1、flyway V4.1 改为V4.2，语句的文件存放地址改为resources/db下
|
2022-07-22 12:03:23 +08:00 |
|
wangliwen
|
a00131421d
|
Merge branch 'master' into docker_package
|
2022-07-22 11:58:42 +08:00 |
|
wangliwen
|
7f59e33101
|
Merge branch 'dev' of http://15.2.21.221:3000/wangliwen/share-platform into dev
|
2022-07-22 11:57:54 +08:00 |
|
wangliwen
|
af7c18df12
|
已办任务内出现待办的问题解决
|
2022-07-22 11:57:28 +08:00 |
|
yitonglei
|
6f72e38a56
|
1、flyway增加V4.1，新增表t_region
2、修改基础设施页面地图中根据区域聚合查询的方法，区市信息以t_region表为准
|
2022-07-22 11:22:39 +08:00 |
|
wangliwen
|
622da8f4e5
|
Merge branch 'master' into docker_package
|
2022-07-22 10:28:57 +08:00 |
|
wangliwen
|
1ebd70df03
|
调整mysql 全文索引使用自然语言搜索模式
|
2022-07-22 10:28:37 +08:00 |
|
wangliwen
|
f3dc7ca4d5
|
Merge branch 'master' into docker_package
|
2022-07-22 08:56:04 +08:00 |
|
yitonglei
|
fc66ef062b
|
同步摄像头通道信息后删除掉经纬度有空的通道
|
2022-07-21 18:18:26 +08:00 |
|
wangliwen
|
f41ef8a3ba
|
Merge branch 'master' into docker_package
|
2022-07-21 17:30:31 +08:00 |
|
wangliwen
|
8de4de904f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-21 17:30:17 +08:00 |
|
wangliwen
|
1af2b0e48e
|
Merge branch 'master' into docker_package
|
2022-07-21 17:29:38 +08:00 |
|
wangliwen
|
66ae7d2fe6
|
...
|
2022-07-21 17:29:08 +08:00 |
|
dinggang
|
6bdd4b3c30
|
1.能力统计部门数统计逻辑修改
|
2022-07-21 17:28:13 +08:00 |
|
wangliwen
|
aa4b0d3d70
|
Merge branch 'master' into docker_package
|
2022-07-21 16:58:23 +08:00 |
|
wangliwen
|
92dc144d7d
|
拆单 是否完成
|
2022-07-21 16:58:03 +08:00 |
|
wangliwen
|
120e5cb13a
|
Merge branch 'master' into docker_package
|
2022-07-21 16:33:34 +08:00 |
|
wangliwen
|
7bdbecfe63
|
。。。
|
2022-07-21 16:33:20 +08:00 |
|
wangliwen
|
412ef1cc78
|
拆单审核所有流程是否完成
|
2022-07-21 16:31:22 +08:00 |
|
wangliwen
|
de73c653b0
|
Merge branch 'master' into docker_package
|
2022-07-21 16:00:20 +08:00 |
|
wangliwen
|
0ac8ef8940
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-21 15:59:57 +08:00 |
|
wangliwen
|
544a673f2a
|
...websocket先收到消息？
|
2022-07-21 15:59:36 +08:00 |
|
dinggang
|
67f8811b21
|
...
|
2022-07-21 15:40:52 +08:00 |
|
wangliwen
|
20851412a4
|
Merge branch 'master' into docker_package
|
2022-07-21 15:34:13 +08:00 |
|
wangliwen
|
4b99279d87
|
审核结束消息通知bug与能力申请节点不进入能力申请异常
|
2022-07-21 15:33:59 +08:00 |
|
wangliwen
|
826f327482
|
Merge branch 'master' into docker_package
|
2022-07-21 15:18:44 +08:00 |
|
wangliwen
|
6fae1071ff
|
...
|
2022-07-21 15:18:31 +08:00 |
|
wangliwen
|
53589991ea
|
Merge branch 'master' into docker_package
|
2022-07-21 14:28:08 +08:00 |