jianjun
|
11680926f8
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
364955346a
|
删除模版
|
4 years ago |
zxc
|
9992e43e32
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
5527271138
|
难点堵点加分数字段
|
4 years ago |
yinzuomei
|
9bb0ac0dba
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
e2127015c5
|
费钉钉
|
4 years ago |
wangxianzhang
|
1e44d01054
|
修改：修改居民信息导入成功和失败后，返回excel的文件名
|
4 years ago |
|
jianjun
|
0a3263a3cc
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
80b24f7d19
|
获取工作人员信息 从缓存获取 2.5
|
4 years ago |
|
jianjun
|
841e23cf24
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
36a396afda
|
获取工作人员信息 从缓存获取 2
|
4 years ago |
zhaoqifeng
|
78cf991f16
|
治理榜单查询修改
|
4 years ago |
|
jianjun
|
b80aacd996
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
4 years ago |
|
jianjun
|
1ddada911c
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
d50d40557d
|
获取工作人员信息 从缓存获取
|
4 years ago |
|
yinzuomei
|
5e6d007ed0
|
都正常返回了，没必要再发个error钉钉
|
4 years ago |
sunyuchao
|
70bafa0a71
|
市平台对接 mq只执行平阴数据
|
4 years ago |
|
yinzuomei
|
7ebb669f86
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
84510605d8
|
/gov/org/customergrid/getgridlistbygridids中error日志降为warn
|
4 years ago |
|
zhaoqifeng
|
8e53562673
|
Merge branch 'dev_agency_govern_daily' into dev
|
4 years ago |
|
zhaoqifeng
|
5ebbd35276
|
治理指数统计修改
|
4 years ago |
|
jianjun
|
acddd3e675
|
Merge remote-tracking branch 'remotes/origin/dev_ic_v2' into dev
|
4 years ago |
|
zxc
|
c73fd60ae1
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
3186b286cc
|
删除多余代码
|
4 years ago |
|
zxc
|
63ed47884d
|
统计事件
|
4 years ago |
|
zxc
|
66eee3a2f5
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
|
4 years ago |
|
zxc
|
f7b756d15e
|
添加日志
|
4 years ago |
|
zxc
|
2695551d84
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
zxc
|
abb76066cc
|
时间修改
|
4 years ago |
|
zxc
|
c1665ee436
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
8b0dfac4f2
|
缓存获取议题表决信息方法修改
|
4 years ago |
|
yinzuomei
|
85d9f6639c
|
calCpcIndexService.calCpcPartyAbility，党员相关党建能力指标抽取，放开代码
|
4 years ago |
|
zxc
|
644296dd1b
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
zxc
|
d237974575
|
加%
|
4 years ago |
|
zhaoqifeng
|
07eac61ef1
|
admin新增年龄范围字典
|
4 years ago |
|
yinzuomei
|
db1653a626
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
jianjun
|
d6f2b17edd
|
纠正 stats 代码
|
4 years ago |
|
jianjun
|
6ddd23305c
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
642660bafb
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
|
4 years ago |
|
jianjun
|
b1a81526e8
|
党建声音支持视频上传 不限格式只限制是视频
|
4 years ago |
|
sunyuchao
|
cbd0e286b6
|
研判分析中项目列表排除当前正在查看的项目
|
4 years ago |
|
yinzuomei
|
04f9bb0933
|
需求的研判分析，排除当前的需求详情
|
4 years ago |
|
yinzuomei
|
1a7e7a4fad
|
serviceShowFlag
|
4 years ago |
|
jianjun
|
369915a942
|
org 代码清理
|
4 years ago |
|
jianjun
|
ca609de121
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_ic_data
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
|
4 years ago |
|
jianjun
|
f24296e141
|
org删除无用 redis类
|
4 years ago |
|
yinzuomei
|
adfc3ecb5b
|
Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data
|
4 years ago |
|
yinzuomei
|
f77aa6e8a2
|
点击居民端小程序用户上报的需求，查看需求研判分析逻辑调整
|
4 years ago |
|
sunyuchao
|
e84ea61898
|
程序优化
|
4 years ago |
|
sunyuchao
|
eaed8608f4
|
bug修改
|
4 years ago |
