wxz
|
ee233c81e9
|
Merge branch 'dev_group_edit' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
|
5 years ago |
sunyuchao
|
896c9fd3f3
|
Merge branch 'dev_wx_msg' into dev
|
5 years ago |
liushaowen
|
873faa606f
|
下调发送订阅的错误日志级别
|
5 years ago |
|
wxz
|
7b27044013
|
Merge branch 'dev_govaccess_async' into dev
|
5 years ago |
|
wxz
|
858e1b58c9
|
修改：调整权限批量添加，api和方法名称调整
|
5 years ago |
|
wxz
|
99ea55660c
|
新增：将默认权限同步到所有客户的指定角色的接口
|
5 years ago |
jianjun
|
3dd2d2899a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
jianjun
|
016ed7793c
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev
|
5 years ago |
|
wxz
|
be43fe97aa
|
Merge branch 'dev_common' into dev
|
5 years ago |
yinzuomei
|
796cc157c7
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
|
yinzuomei
|
6dab1ffef0
|
修改user服务/userresiinfo/getuserresiinfo接口
|
5 years ago |
wangchao
|
af4c0091ed
|
难点赌点 修正时间
|
5 years ago |
|
jianjun
|
122c8cebcc
|
job feign接口日志配置
|
5 years ago |
|
wangchao
|
7f44a2d45c
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
|
wangchao
|
f709bedaf5
|
难点赌点 全删全增
|
5 years ago |
|
jianjun
|
bffe8dc539
|
暂时废弃 初始化多appId的方式代码
|
5 years ago |
|
wxz
|
cac28f16de
|
Merge branch 'dev_gateway_whitelist' into dev
|
5 years ago |
|
jianjun
|
52b0eaea1b
|
服务统一添加 错误告警
|
5 years ago |
|
jianjun
|
97f4d46372
|
调用feign接口失败 返回错误，创建议题失败
|
5 years ago |
|
jianjun
|
252e4f76b2
|
httpclientManger 调整超时时间
|
5 years ago |
|
wangchao
|
203cfd864a
|
抽取到大屏-难点赌点、热心市民，小组原始数据，兼容因为删除网格而造成垃圾数据的情况
|
5 years ago |
|
sunyuchao
|
6d6f4b6c9d
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
jianjun
|
dd9fadda9c
|
httpclientManger 提取常量；调整超时时间为3-》4秒
|
5 years ago |
|
jianjun
|
ea4045b37e
|
修改 项目原始数据抽取 删除数据提出
|
5 years ago |
|
jianjun
|
0b4375f87c
|
修改 项目原始数据抽取 删除数据提出
|
5 years ago |
|
wangchao
|
97706e0a17
|
抽取到大屏-难点赌点、热心市民，兼容因为删除网格而造成垃圾数据的情况
|
5 years ago |
|
sunyuchao
|
4b4a3f68d9
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
b7753e0272
|
bug修改，feginclient多添加url问题
|
5 years ago |
|
jianjun
|
851bc4f3d7
|
日抽取添加 使用线程池异步方法
|
5 years ago |
|
jianjun
|
64954f43de
|
日抽取添加 异步方法
|
5 years ago |
|
jianjun
|
ce4d6e4f91
|
得分写入失败打印异常
|
5 years ago |
|
jianjun
|
cc54476df0
|
得分写入失败打印异常
|
5 years ago |
|
jianjun
|
1f495c3d9f
|
公众参与解决 dimGrid 维度不存在时的情况兼容
|
5 years ago |
|
wangchao
|
55df7c1e77
|
小组原始数据抽取，如果维度-网格没有网格数据，以维度-网格数据为主，没有删除的组数据会被移除
|
5 years ago |
|
wxz
|
cd6f50a9de
|
修改:提交组信息编辑的时候，判断当前编辑人是否是组长，只有组长才允许编辑
|
5 years ago |
|
wxz
|
9984a549b0
|
Merge branch 'dev_exception_handle' into dev_group_edit
|
5 years ago |
|
wxz
|
508497d9c3
|
Merge branch 'dev_exception_handle' into dev
|
5 years ago |
|
wxz
|
2244ae5c4d
|
异常类增加MessageMode枚举
|
5 years ago |
|
yinzuomei
|
c373e95aba
|
基层治理-群组管理红点计算（+变更小组申请单）
|
5 years ago |
|
sunyuchao
|
901ba930cf
|
Merge branch 'dev_oper_login' into dev
|
5 years ago |
|
wangchao
|
16bd05b951
|
extstaffinfo 转议题
|
5 years ago |
|
wangchao
|
fc67e51096
|
组修改审核通过后删除该组信息的缓存
|
5 years ago |
|
sunyuchao
|
dcace958e6
|
程序优化
|
5 years ago |
|
sunyuchao
|
658430681b
|
Merge branch 'dev_oper_login' into dev
|
5 years ago |
|
jianjun
|
a2c0eb0ea8
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
a10654d1cb
|
修复关于10.27提交代码错误的把历史接口返参dto替换调的问题-PC工作端登陆获取用户基本信息接口
|
5 years ago |
|
jianjun
|
0325d7df2e
|
统计公众参与 添加判断，存在 网格Id不存在的情况
|
5 years ago |
|
wxz
|
fa7143f955
|
修改：gateway新增内部接口url白名单
|
5 years ago |
|
jianjun
|
96d1ad3ef3
|
标签错误
|
5 years ago |
|
jianjun
|
0ca6b0dabc
|
判断错误
|
5 years ago |
