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 |
|
jianjun
|
0b74d92a59
|
HttpClientManager header修改为object
|
5 years ago |
zxc
|
2ceca250af
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
zxc
|
dcd3478239
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
|
5 years ago |
|
zxc
|
8af2c79a67
|
治理能力 修改
|
5 years ago |
|
zxc
|
894a258268
|
难点堵点查询修改
|
5 years ago |
wxz
|
b3b373bb11
|
Merge branches 'dev' and 'dev_jcet' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jcet
|
5 years ago |
|
wxz
|
95d13b3d5f
|
增加G端ssotoken登录
修改G端登录接口
|
5 years ago |
yinzuomei
|
90fb490324
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
8fe5dfdcf2
|
热心市民排行接口修改
|
5 years ago |
|
yinzuomei
|
e56d9fed17
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
179e2d69a4
|
热心市民排行接口修改
|
5 years ago |
|
yinzuomei
|
b68d7062be
|
先进党员排行接口修改
|
5 years ago |
|
yinzuomei
|
88eaf43bf3
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen
|
5 years ago |
|
yinzuomei
|
87a22641ff
|
先进支部排行接口修改
|
5 years ago |
wangchao
|
6beccb0d53
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen
|
5 years ago |
|
wangchao
|
c054afee85
|
screen/project 月度数量分析接口
|
5 years ago |
|
yinzuomei
|
0563e65ff9
|
党员联系群众接口修改
|
5 years ago |
|
wxz
|
84605cc7cb
|
解决代码编译不通过
|
5 years ago |
|
wxz
|
dcc3821641
|
Merge branch 'dev_jcet' into dev_temp
# Conflicts:
# epmet-auth/src/main/resources/bootstrap.yml
# epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java
# epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/properties/ThirdplatProps.java
|
5 years ago |
|
wxz
|
2ec73d7dc2
|
【酒城e通居民登录】将yml的秘钥相关配置分成2份，c端和g端
|
5 years ago |
|
yinzuomei
|
8b20103db9
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
zxc
|
a66c42e28c
|
党员基本情况-饼状图概况 撤回
|
5 years ago |
|
zxc
|
bf5b78003a
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen
|
5 years ago |
|
zxc
|
e306b0391c
|
党员基本情况-饼状图概况 修改
|
5 years ago |
|
yinzuomei
|
112f301b1a
|
Merge branches 'dev' and 'dev_pyscreen' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_pyscreen
|
5 years ago |
|
wangchao
|
aca279ee52
|
公众参与概况/公众参与排行榜根据areaCode检索(查找子客户列表返回失败时默认没有子客户)
|
5 years ago |
|
wxz
|
9806f049de
|
Merge branch 'dev_bugfix_customerid_repeat' into dev_temp
|
5 years ago |
|
wxz
|
d3fd2c3c20
|
修改内部鉴权处理器，解决header中CustomerId重复的问题
|
5 years ago |
|
jianjun
|
cbcd65cb08
|
第三方登陆代码微调
|
5 years ago |
|
yinzuomei
|
cfdd29e79c
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
26b7cb51f4
|
工作日志查询接口bug修改
|
5 years ago |
|
yinzuomei
|
392489c930
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
yinzuomei
|
1b8869550f
|
工作日志查询接口测试
|
5 years ago |
liushaowen
|
29b5c2ba9f
|
Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
liushaowen
|
66037cc206
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
|
5 years ago |
|
yinzuomei
|
568b2cdf17
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev
|
5 years ago |
|
yinzuomei
|
8954b31f19
|
添加del_flag='0'
|
5 years ago |
|
liushaowen
|
b99b803b9d
|
项目信息上报，和查询 补
|
5 years ago |
|
jianjun
|
dc031bbaa0
|
Merge remote-tracking branch 'remotes/origin/dev_pyscreen' into dev_temp
|
5 years ago |
|
jianjun
|
47b29d5bc4
|
第三方登陆返回错误信息
|
5 years ago |
|
yinzuomei
|
1feda0ae35
|
Merge branches 'dev' and 'dev_pyscreen' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_pyscreen
|
5 years ago |
|
yinzuomei
|
acc99bbc0b
|
Merge remote-tracking branch 'origin/dev_longwanscreen' into dev
|
5 years ago |
|
yinzuomei
|
0ee93cfde9
|
难点赌点接口bug
|
5 years ago |
|
yinzuomei
|
615280bfaa
|
Merge remote-tracking branch 'origin/dev_longwanscreen' into dev
|
5 years ago |
|
wangchao
|
4729219989
|
Merge remote-tracking branch 'origin/dev_longwanscreen' into dev_temp
|
5 years ago |
|
wangchao
|
87c9444625
|
难点赌点
|
5 years ago |
|
yinzuomei
|
9eb236cc49
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev
|
5 years ago |
|
yinzuomei
|
abef0b95d3
|
data-stat统计服务修改:指标计算获取子客户列表
|
5 years ago |
|
yinzuomei
|
ceda07db1c
|
datastat+1
|
5 years ago |
