yinzuomei
|
2b493a24d7
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
yinzuomei
|
61bdc38bd5
|
aggopenfeign
|
4 years ago |
zxc
|
680336195d
|
提示语
|
4 years ago |
|
yinzuomei
|
4c1473c104
|
每周一执行，取上个自然周
|
4 years ago |
|
yinzuomei
|
cbd729d9dd
|
活跃度导出上传oss发钉钉
|
4 years ago |
|
yinzuomei
|
eda94b5b02
|
temp
|
4 years ago |
|
zxc
|
ff38e2ba03
|
提示拆分
|
4 years ago |
sunyuchao
|
f5ff0fbcac
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
sunyuchao
|
680327f7de
|
社会自组织导入bug修改
|
4 years ago |
|
zxc
|
786c702100
|
bug
|
4 years ago |
|
yinzuomei
|
9cd3023ef6
|
temp
|
4 years ago |
|
zxc
|
7c2b57fa25
|
楼栋导入新增更新户数
|
4 years ago |
wangxianzhang
|
56ceeaf58b
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
wangxianzhang
|
706b91ee31
|
导入任务创建-修改进行中的导入的提示语
|
4 years ago |
|
zxc
|
34af77d0c6
|
提示语
|
4 years ago |
|
wangxianzhang
|
b340125289
|
新增脚本
|
4 years ago |
zhaoqifeng
|
3256f76f32
|
居民端活动详情
|
4 years ago |
|
zxc
|
170ad7426f
|
名字
|
4 years ago |
|
zhaoqifeng
|
d039e04e8f
|
联建活动旧数据处理脚本
|
4 years ago |
|
sunyuchao
|
23cbac8d61
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
sunyuchao
|
a33160a77d
|
社会自组织导入 必要列设置不能为空
|
4 years ago |
|
zhaoqifeng
|
0c14dfeeca
|
联建活动旧数据处理脚本
|
4 years ago |
|
wangxianzhang
|
fbedcc1ad0
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_import
|
4 years ago |
|
wangxianzhang
|
fa473bb10c
|
修改：
【居民信息导入】模板变更。bug修复
|
4 years ago |
|
sunyuchao
|
4e22972fe4
|
导入程序调整
|
4 years ago |
|
wangxianzhang
|
e5a354a4f5
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_import
Conflicts:
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
|
4 years ago |
|
wangxianzhang
|
993b303b17
|
Merge branch 'wxz_threadpool' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
jianjun
|
e16f28f121
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
848f82f3d6
|
验证码改为纯小写字母
|
4 years ago |
|
jianjun
|
94ec1cceb9
|
stats 去掉线程池定义 直接使用服务定义的线程池
|
4 years ago |
|
jianjun
|
5128a9202b
|
调整日志位置
|
4 years ago |
|
jianjun
|
c3cef2d4fb
|
修改日志级别
|
4 years ago |
|
wangxianzhang
|
1f248dc02e
|
修改：
common-tools增加通用线程池配置类
每个服务增加线程池配置xml和yml
|
4 years ago |
|
wangxianzhang
|
ab25971c09
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
5acdfa9463
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
wangxianzhang
|
36f7f9471d
|
修改：
1.ResultDataResolver中的逻辑
|
4 years ago |
|
jianjun
|
1950214b1d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
23872c9682
|
指标计算方法调用 挪到原始数据抽取完后计算
|
4 years ago |
|
sunyuchao
|
89229c53a6
|
导入调整
|
4 years ago |
|
zxc
|
944702a47b
|
添加状态
|
4 years ago |
|
zxc
|
69b3cf205c
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
3e770e9a15
|
排除报事
|
4 years ago |
|
sunyuchao
|
bfd990fb56
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
989e2ea826
|
新增工作人员对应的工作人员角色表的orgId永远都是组织Id
|
4 years ago |
|
jianjun
|
154d4ed0a8
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
e59852d086
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
162bbf97da
|
指标计算调整 暂未发现重复计算的问题
|
4 years ago |
|
yinzuomei
|
f1605f009a
|
退群加个注释
|
4 years ago |
|
jianjun
|
f6dc586ffd
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
jianjun
|
c9e439d8f9
|
gateway commonservice配置错误调整
|
4 years ago |
