jianjun
|
fcef1ba481
|
Merge branch 'pingyin_master' into dev_test_pingyin
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
# epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
# epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
|
3 years ago |
|
jianjun
|
894aea865c
|
user org project read write
|
3 years ago |
|
jianjun
|
11a267dd50
|
Merge remote-tracking branch 'remotes/origin/dev_write_read_db_2.0' into pingyin_master
# Conflicts:
# epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
# epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml
# epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
# epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml
# epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml
# epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml
# epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
# epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
# epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
# epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml
# epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
# epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml
# epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
# epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
# epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
# epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml
# epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
# epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
# epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
# epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
# epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
# epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
# epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
|
3 years ago |
|
jianjun
|
e76b39c9be
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into pingyin_master
|
3 years ago |
|
jianjun
|
f23a21d5a4
|
根据市里的变动做变动
|
3 years ago |
|
jianjun
|
3a90f2d128
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
|
3 years ago |
|
jianjun
|
a3954af108
|
减少异常抛出
|
3 years ago |
|
jianjun
|
2ebf25ee28
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into pingyin_master
|
3 years ago |
|
jianjun
|
fb3eeadc9f
|
我想错了
|
3 years ago |
|
jianjun
|
4da4dc9b67
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into pingyin_master
|
3 years ago |
|
jianjun
|
b3ba705b76
|
过滤没有身份证号的
|
3 years ago |
|
jianjun
|
3b581aebfc
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
3 years ago |
|
jianjun
|
b6189adcc6
|
删除缓存
|
3 years ago |
zhaoqifeng
|
e7b5cd661a
|
党员风采修改
|
3 years ago |
|
zhaoqifeng
|
ba8a8d25c8
|
事件上报网格信息从customer_grid表获取
|
3 years ago |
yinzuomei
|
38e8e14cd5
|
删除居民信息，更新时间，更新用户
|
3 years ago |
|
jianjun
|
47dc89e9ac
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into pingyin_master
|
3 years ago |
|
jianjun
|
cdc4055b7b
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
1114e356da
|
居民删除更新时间
|
3 years ago |
wangxianzhang
|
8f85b56758
|
Merge branch 'dev_jmreport' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
2408221436
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
23d49e6c65
|
【报表】pc工作单报表列表-修改isList的获取逻辑
|
3 years ago |
|
wangxianzhang
|
97fc8e40c0
|
Merge branch 'dev_jmreport' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jmreport
|
3 years ago |
|
zhaoqifeng
|
9ddf2ffdf0
|
三个街道项目closed按结案算
|
3 years ago |
|
wangxianzhang
|
496986cf65
|
Merge branches 'dev_jmreport' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
yinzuomei
|
f5f2bf8d81
|
批量删除居民信息
|
3 years ago |
|
wangxianzhang
|
975d1f1c31
|
Merge branch 'dev_jmreport'
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java
# 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
|
3 years ago |
|
wangxianzhang
|
93c7a3a094
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
95d234ec61
|
Merge branch 'dev_jmreport' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jmreport
|
3 years ago |
|
wangxianzhang
|
34776d4f15
|
【报表】批量导出-jmreport并发处理能力不太行，会出现空白excel，没数据填充
|
3 years ago |
zxc
|
32225e30ba
|
新增一个isList
|
3 years ago |
|
jianjun
|
98f9ede0e5
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into pingyin_master
|
3 years ago |
|
jianjun
|
8a5f74a6cf
|
平阴数据对接调整 办结和化解状态同步
|
3 years ago |
|
wangxianzhang
|
1f1dfb1a77
|
Merge remote-tracking branch 'origin/dev_jmreport' into dev_jmreport
|
3 years ago |
|
wangxianzhang
|
fbb52ecf7c
|
【报表】批量导出-多线程及系列优化
|
3 years ago |
|
zhaoqifeng
|
0bd762d55d
|
党支部不为空
|
3 years ago |
|
zxc
|
c07d4b29da
|
新增一个isList
|
3 years ago |
syc
|
58b33c566f
|
Merge branch 'dev_py_static_list_syc' into pingyin_master
|
3 years ago |
|
zhaoqifeng
|
3621a34f4e
|
党支部不为空
|
3 years ago |
|
syc
|
d216530497
|
平阴数据统计列表调整查询组织、网格逻辑
|
3 years ago |
|
wangxianzhang
|
729bf41e1b
|
【报表】customize服务增加挂载：- "/opt/epmet_files/:/opt/epmet_files"
|
3 years ago |
|
wangxianzhang
|
45852c255c
|
Merge branch 'dev_jmreport' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jmreport
|
3 years ago |
|
wangxianzhang
|
079a3ccf73
|
【报表】listIds()方法，适配fix
|
3 years ago |
|
wangxianzhang
|
fd345407a4
|
Merge branch 'dev_py_static_list_syc' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
|
3 years ago |
|
wangxianzhang
|
83f6da94e8
|
Merge branch 'pingyin_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
|
3 years ago |
|
wangxianzhang
|
c004fde390
|
动态查询居民,居民ID列返回原值
|
3 years ago |
|
wangxianzhang
|
6f87d910fb
|
动态查询居民，固定查询居民ID列：IC_RESI_ID
|
3 years ago |
|
yinzuomei
|
5b5161de13
|
id
|
3 years ago |
|
syc
|
2444b6f87a
|
平阴数据统计列表调整查询组织、网格逻辑
|
3 years ago |
|
yinzuomei
|
03e904b4d4
|
test
|
3 years ago |
