wxz
|
a6ce48231e
|
Merge branches 'dev', 'release_temp' and 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wxz
|
073f1aa456
|
Merge branches 'dev' and 'wxz_senseless_deploy' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wxz
|
a84edc743b
|
Merge branches 'dev' and 'dev_dim_addcode' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wxz
|
5480c8037f
|
修改：
1.调整 NacosServiceListListenerRegisterer 中部分日志的级别为debug
|
4 years ago |
zxc
|
1e36a99f81
|
分类截取位数
|
4 years ago |
|
wxz
|
cead5506b7
|
Merge branches 'dev_dim_addcode' and 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
Conflicts:
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
|
4 years ago |
|
wxz
|
8852ce3ebd
|
修改：
dim同步，增加code字段 的同步
|
4 years ago |
jianjun
|
5f4fd78171
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
d41212b455
|
因为分类还没更新，暂时先按照4位截取
|
4 years ago |
|
jianjun
|
e67e0047b2
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
baaebce096
|
日志级别调整
|
4 years ago |
|
jianjun
|
5190d67338
|
日志级别调整
|
4 years ago |
|
wxz
|
5918078cd4
|
Merge branches 'dev' and 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
Conflicts:
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
|
4 years ago |
|
wxz
|
214b025bda
|
修改：
/resi/point/gridpointrank 接口，网格名称只显示网格名，不显示社区名
|
4 years ago |
|
jianjun
|
9ca5a6880c
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
zxc
|
5d7b9a7962
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
aa6d06b417
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
254aa70959
|
网格分类统计修改
|
4 years ago |
|
zxc
|
956d31e5f8
|
直接立项的查询修改
|
4 years ago |
yinzuomei
|
c299162892
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
344f55740b
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
3dacef8c26
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
e3fb8b5ae7
|
ScreenProjectSettleService.extractScreenData新增origin,categoryCode.顺便改了下orgName。来源于议题的存储网格名，来源于事件和立项的都存储的是project.agencyId对应的组织名称
|
4 years ago |
|
yinzuomei
|
01d1bdf007
|
/project/uploadprojectinfo,3个街道上传入参新增categoryCode，值为项目在其客户中的编码。
|
4 years ago |
|
yinzuomei
|
9805daae5f
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
b65aa5d871
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
36e9f612c6
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
d28dc9fdd4
|
测试
|
4 years ago |
|
yinzuomei
|
fa9ee7e21e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
eeb775d89c
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
c61569f6aa
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
4f47c6607d
|
难点堵点分类编码和名称bugfix，extractProjectCategory修改
|
4 years ago |
|
yinzuomei
|
ffa11df01e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
|
4 years ago |
|
yinzuomei
|
f6aff9a2ac
|
screen_project_data分类名称、项目分类id接口调整。
|
4 years ago |
|
yinzuomei
|
a9b81d7f66
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
|
4 years ago |
|
zxc
|
31489e3425
|
customerId限制
|
4 years ago |
|
yinzuomei
|
7446dfb399
|
screen_project_xx表手动调用方法试试
|
4 years ago |
|
yinzuomei
|
30e8711868
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
64b634d770
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
9a021713b7
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
32420502c5
|
fact_origin_project_category_daily抽取逻辑修改下
|
4 years ago |
|
yinzuomei
|
bcc878b358
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
wxz
|
4bf11bee15
|
Merge branches 'dev' and 'wxz_senseless_deploy' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
yinzuomei
|
078448b60b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
b4bc82d9b8
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
d70f783f35
|
议题转项目发送消息bug修改
|
4 years ago |
|
wxz
|
850ecd2132
|
Merge branch 'wxz_senseless_deploy' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wxz
|
eb3b543ea0
|
Merge branch 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wxz
|
4b39fbdf1d
|
Merge branch 'wxz_senseless_deploy' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wxz
|
8e7eff235e
|
Merge branches 'dev' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
