wangchao
|
46a427a85b
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen
|
5 years ago |
jianjun
|
0822e05479
|
修改错误信息
|
5 years ago |
|
wangchao
|
f6b97632d5
|
公众参与接口对查询的字段为空时填充0
|
5 years ago |
yinzuomei
|
3c6354b37a
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
f0a818d3f5
|
难点堵点查询接口修改
|
5 years ago |
|
wangchao
|
f3a733180b
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
wangchao
|
57c1586c6a
|
data/report/plugins/ofs/list 接口给名称加上序号
|
5 years ago |
|
yinzuomei
|
7f0cd22817
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
a6180241d6
|
【146体系】竞标管理-列表添加注解，可查询fake
|
5 years ago |
|
yinzuomei
|
1bd82fe6b2
|
Merge branches 'dev' and 'dev_pyscreen' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_pyscreen
|
5 years ago |
zxc
|
83b9995acf
|
事件统计上传
|
5 years ago |
|
yinzuomei
|
5b6490e964
|
Merge remote-tracking branch 'origin/dev_longwanscreen' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
|
5 years ago |
|
yinzuomei
|
c53ee76abf
|
项目详情接口data/report/project/projectdetail增加返参topicContent3
|
5 years ago |
|
yinzuomei
|
9aa2d0dfb3
|
项目详情接口data/report/project/projectdetail增加返参topicContent2
|
5 years ago |
|
yinzuomei
|
8deb6a14fe
|
合并代码冲突解决
|
5 years ago |
|
yinzuomei
|
be29a58b39
|
Merge remote-tracking branch 'origin/dev_longwanscreen' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
|
5 years ago |
|
yinzuomei
|
0a356686ba
|
项目详情接口data/report/project/projectdetail增加返参topicContent
|
5 years ago |
|
yinzuomei
|
9afcaacd33
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
liushaowen
|
d1c13b3595
|
项目详情接口地址修改
|
5 years ago |
|
yinzuomei
|
f9c33183f8
|
data/report/project/projectdetail接口提示信息修改
|
5 years ago |
|
yinzuomei
|
6a29a921b8
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
be99eb8077
|
事件分析抽取逻辑bug修改，效率分析查询接口修改
|
5 years ago |
|
yinzuomei
|
118c445ddc
|
平阴大屏新增api/data/report/screen/index/subagencyindexrank-py:下级部门or网格指数排行
|
5 years ago |
|
yinzuomei
|
8226eec2bb
|
党员志愿者服务查询
|
5 years ago |
|
yinzuomei
|
6a2db9a9b0
|
5、【工作日志】本机及下级排名接口修改
|
5 years ago |
|
yinzuomei
|
30a704d329
|
5、【工作日志】本机及下级排名接口修改
|
5 years ago |
|
yinzuomei
|
af5932ce2c
|
基层治理：公众参与概况、公众参与排行、治理能力榜单3个查询接口bug修改
|
5 years ago |
|
yinzuomei
|
73e0d8672e
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
89aafff916
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen
|
5 years ago |
|
yinzuomei
|
c7c04671ef
|
事件分析抽取
|
5 years ago |
|
zxc
|
e60b2ba6ab
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
zxc
|
5e18916bb1
|
下级组织/部门指数排行 修改
|
5 years ago |
|
yinzuomei
|
ac97e33152
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
6006100c76
|
事件分析-添加汇总测试方法
|
5 years ago |
|
zxc
|
43572b9827
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
zxc
|
feba9e2b3c
|
areaCOde长度限制删除
|
5 years ago |
wxz
|
c3ca93250d
|
Merge branch 'dev_jcet' into dev_temp
# Conflicts:
# epmet-auth/src/main/java/com/epmet/controller/SsoController.java
# epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java
# epmet-auth/src/main/resources/bootstrap.yml
|
5 years ago |
|
wxz
|
bf2e8786dc
|
【sso登录】修改third服务的地址的写法，由硬编码改为配置文件取
|
5 years ago |
|
wxz
|
c64399693d
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_jcet
|
5 years ago |
|
wxz
|
c64a35837c
|
修改sso居民端登录接口的一些命名
|
5 years ago |
sunyuchao
|
6ce5035a25
|
Merge branch 'dev_jcet' into dev_temp
|
5 years ago |
|
sunyuchao
|
24001e55ab
|
h5工作端登陆接口入参调整
|
5 years ago |
|
yinzuomei
|
5c86d66eda
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
a19995fa91
|
事件类型查询接口调整
|
5 years ago |
|
jianjun
|
56b90275b7
|
解决冲突
|
5 years ago |
|
jianjun
|
4f79fa5106
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
jianjun
|
f26a99bfb0
|
Merge remote-tracking branch 'remotes/origin/dev_jcet' into dev_temp
# Conflicts:
# epmet-auth/src/main/java/com/epmet/controller/SsoController.java
# epmet-auth/src/main/java/com/epmet/service/SsoService.java
# epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
|
5 years ago |
|
zxc
|
9c8ceeccab
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
zxc
|
fe9170675b
|
项目(事件)抽取添加
|
5 years ago |
|
jianjun
|
0b74d92a59
|
HttpClientManager header修改为object
|
5 years ago |
