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
|
c6f8f9de7d
|
Merge branch 'dev_import' into develop
|
4 years ago |
|
wangxianzhang
|
9b1c47f235
|
新增脚本
|
4 years ago |
|
zhaoqifeng
|
3256f76f32
|
居民端活动详情
|
4 years ago |
|
zxc
|
02a9ce63cb
|
Merge remote-tracking branch 'origin/dev_import' into develop
|
4 years ago |
sunyuchao
|
1593bf6362
|
第一版项目统计，平阴数据统计时只统计了五个街道的其他三个是上报的，现在这三个街道在小程序也产生了数据需要统计上，因此修改获取组织网格维度的逻辑
|
4 years ago |
|
zxc
|
170ad7426f
|
名字
|
4 years ago |
|
sunyuchao
|
d6c8eafe5d
|
Merge branch 'dev_import' into develop
|
4 years ago |
|
zhaoqifeng
|
d039e04e8f
|
联建活动旧数据处理脚本
|
4 years ago |
|
sunyuchao
|
c903d13873
|
Merge branch 'dev_import' into develop
|
4 years ago |
jianjun
|
c265a18ffb
|
条件位置调整
|
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 |
|
zxc
|
df025898fe
|
Merge remote-tracking branch 'origin/dev_delete' into develop
|
4 years ago |
|
zxc
|
ecf2914573
|
del
|
4 years ago |
yinzuomei
|
87bcf6410c
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
wangxianzhang
|
763b1f699d
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
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 |
|
yinzuomei
|
11718139e8
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
b07057b14c
|
NullPointerException
|
4 years ago |
|
sunyuchao
|
b7b4f97ca8
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
a195f89323
|
项目分类统计导出文件日期不对问题
|
4 years ago |
|
jianjun
|
99ded4a8ea
|
添加防重复提交
|
4 years ago |
|
zxc
|
7d53f1f348
|
Merge remote-tracking branch 'origin/dev_delete' into develop
|
4 years ago |
|
zxc
|
fdd3bb8c0d
|
del
|
4 years ago |
|
yinzuomei
|
8c15ef9859
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
19f1d22d1d
|
add index sql
|
4 years ago |
|
yinzuomei
|
936932d060
|
calCpcPartyAbilityV2
|
4 years ago |
|
yinzuomei
|
31f0e4878a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
180bc56d08
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
sunyuchao
|
b76de2b345
|
Merge branch 'dev_import' into develop
|
4 years ago |
|
zxc
|
9964ccfcfe
|
Merge remote-tracking branch 'origin/dev_delete' into develop
|
4 years ago |
|
zxc
|
e6f1298f4e
|
顿号改逗号
|
4 years ago |
|
sunyuchao
|
4e22972fe4
|
导入程序调整
|
4 years ago |
|
yinzuomei
|
51025f5058
|
党员自建群活跃群众人数
|
4 years ago |
|
zxc
|
39803b60bf
|
Merge remote-tracking branch 'origin/dev_delete' into develop
|
4 years ago |
|
zxc
|
49cde60fb0
|
del
|
4 years ago |
|
zxc
|
42555a8476
|
Merge remote-tracking branch 'origin/dev_delete' into develop
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
|
4 years ago |
|
zxc
|
391b37ed9d
|
del
|
4 years ago |
|
yinzuomei
|
b7b2c2270f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
861d46638e
|
500
|
4 years ago |
|
zxc
|
5d9534da94
|
error code
|
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 |
|
yinzuomei
|
fb1f35904d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
d5bca533c5
|
calCpcPartyAbilityV2试试
|
4 years ago |
