wxz
|
a4d73a19c6
|
Merge branches 'dev' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
Conflicts:
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
|
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 |
zxc
|
1e36a99f81
|
分类截取位数
|
4 years ago |
|
wxz
|
8852ce3ebd
|
修改：
dim同步，增加code字段 的同步
|
4 years ago |
jianjun
|
3cda18e816
|
因为分类还没更新，暂时先按照4位截取 及错误日志级别调整 上线
|
4 years ago |
|
jianjun
|
f4970b0171
|
Merge remote-tracking branch 'remotes/origin/dev'
|
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
|
fd33850312
|
版本升级
|
4 years ago |
|
wxz
|
992f115864
|
Merge branches 'dev' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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
|
254aa70959
|
网格分类统计修改
|
4 years ago |
|
zxc
|
956d31e5f8
|
直接立项的查询修改
|
4 years ago |
yinzuomei
|
e6001d56f8
|
统计239
|
4 years ago |
|
yinzuomei
|
fbf5689277
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
c299162892
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
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
|
dbfd9950be
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
b65aa5d871
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
d28dc9fdd4
|
测试
|
4 years ago |
|
yinzuomei
|
98dfe70443
|
stats、project
|
4 years ago |
|
yinzuomei
|
9595f7248f
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
fa9ee7e21e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
4f47c6607d
|
难点堵点分类编码和名称bugfix，extractProjectCategory修改
|
4 years ago |
|
yinzuomei
|
f6aff9a2ac
|
screen_project_data分类名称、项目分类id接口调整。
|
4 years ago |
|
yinzuomei
|
86af48ffca
|
问卷bug、stats
|
4 years ago |
|
yinzuomei
|
edeb272980
|
Merge remote-tracking branch 'origin/dev'
|
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
|
c5e2078211
|
fact_origin_project_category_daily抽取逻辑修改下，data-stats发布
|
4 years ago |
|
yinzuomei
|
30adfd455c
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
30e8711868
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
32420502c5
|
fact_origin_project_category_daily抽取逻辑修改下
|
4 years ago |
|
wxz
|
34a783da94
|
版本升级
|
4 years ago |
|
wxz
|
27d0cdfcd0
|
Merge branches 'dev' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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
|
8c40eb3001
|
议题转项目发送消息bug修改 issue 89
|
4 years ago |
|
yinzuomei
|
4cafa99777
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
078448b60b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
d70f783f35
|
议题转项目发送消息bug修改
|
4 years ago |
|
wxz
|
bf0b9dfc63
|
修改：
1.CpAuthGatewayFilter的逻辑抽取为单独的类，增加针对此filter的异常拦截
|
4 years ago |
|
zxc
|
0c89a324a5
|
user升级
|
4 years ago |
|
zxc
|
baede6ad34
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
afbc6d372a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
