zxc
|
fca8867d69
|
反参修改
|
5 years ago |
wangchao
|
147fe31528
|
Merge branch 'dev_bugfix_sync_issue_vote' into dev_temp
|
5 years ago |
|
wangchao
|
38ca4218d0
|
ext查询staff信息时，agencyPath包括本级别单位
|
5 years ago |
|
zxc
|
1164b2807a
|
非空
|
5 years ago |
wxz
|
3a409fdf5d
|
修改rocketmq，客户初始化的topic和消费者组名称
|
5 years ago |
yinzuomei
|
7c4acf14e4
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
1b51d028eb
|
支部建设、联建共建下级列表接口修改
|
5 years ago |
|
yinzuomei
|
2fcc48e21d
|
支部建设、联建共建下级列表接口修改
|
5 years ago |
|
yinzuomei
|
418413d187
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
266a31158e
|
支部建设、联建共建下级列表接口修改
|
5 years ago |
|
yinzuomei
|
00357cc956
|
支部建设、联建共建下级列表接口修改
|
5 years ago |
|
wangchao
|
76762da205
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
jianjun
|
c646a2a91b
|
代码微调
|
5 years ago |
|
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 |
