wangxianzhang
|
c8048c6553
|
错误的pom文件合并
|
3 years ago |
|
wangxianzhang
|
73a0d91115
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
Conflicts:
epmet-admin/epmet-admin-server/pom.xml
epmet-module/data-statistical/data-statistical-server/pom.xml
epmet-module/epmet-heart/epmet-heart-server/pom.xml
epmet-module/epmet-message/epmet-message-server/pom.xml
epmet-module/epmet-point/epmet-point-server/pom.xml
epmet-module/gov-issue/gov-issue-server/pom.xml
epmet-module/gov-org/gov-org-server/pom.xml
epmet-module/open-data-worker/open-data-worker-server/pom.xml
epmet-module/oper-customize/oper-customize-server/pom.xml
epmet-module/resi-group/resi-group-server/pom.xml
epmet-user/epmet-user-server/pom.xml
|
3 years ago |
sunyuchao
|
37bcff5669
|
bug修改
|
3 years ago |
jianjun
|
e873097e85
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master
|
3 years ago |
|
jianjun
|
a0abf74dcd
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
jianjun
|
2d9198f2c3
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
813c83d2ed
|
房屋查询导出 每次1w
|
3 years ago |
wanggongfeng
|
f7ddf9a38c
|
Merge branch 'feature/dev_point_manage'
|
3 years ago |
|
wanggongfeng
|
28787af782
|
疫苗接种点，核酸检测点 添加customerId筛选
|
3 years ago |
|
wanggongfeng
|
1ccd7a318a
|
Merge branch 'feature/dev_point_manage'
|
3 years ago |
|
wanggongfeng
|
72433c71b5
|
疫苗接种点，核酸检测点 添加customerId筛选
|
3 years ago |
|
jianjun
|
ef3ba79a01
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
80af8c8e66
|
房屋查询导出 每次1w
|
3 years ago |
|
jianjun
|
ff805d2cb7
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
25df6e4518
|
修改查询导致 导出一户一档
|
3 years ago |
|
jianjun
|
9aed316562
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master
|
3 years ago |
|
jianjun
|
4fe73d0171
|
导入居民查询时bug
|
3 years ago |
|
jianjun
|
527bd9f9fb
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
jianjun
|
75b79d157d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
4515f23465
|
导入居民查询时bug
|
3 years ago |
|
wanggongfeng
|
b596e47d39
|
Merge branch 'feature/dev_point_manage'
|
3 years ago |
|
wanggongfeng
|
85dbb9731a
|
疫苗接种点，核酸检测点 优化
|
3 years ago |
|
jianjun
|
9e87f7f9b8
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master
|
3 years ago |
|
jianjun
|
026f5ad627
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
9e62faa944
|
导入居民查询时bug
|
3 years ago |
|
wanggongfeng
|
e98514a194
|
Merge branch 'feature/dev_point_manage'
# Conflicts:
# epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
# epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
|
3 years ago |
|
wanggongfeng
|
100a313c28
|
疫苗接种点，核酸检测点 优化
|
3 years ago |
|
wanggongfeng
|
853ae5bf60
|
疫苗接种点，核酸检测点 优化
|
3 years ago |
|
wanggongfeng
|
c09a0df54b
|
疫苗接种点，核酸检测点 优化
|
3 years ago |
|
wanggongfeng
|
44ac0b4692
|
疫苗接种点，核酸检测点 优化
|
3 years ago |
HAHA
|
7a6b6084a2
|
Merge branch 'dev_party_mange'
|
3 years ago |
|
HAHA
|
356fcfc67c
|
修改排序规则
|
3 years ago |
|
wangxianzhang
|
1b72ee380f
|
修复：居民党员信息导入 测试环境mq地址错误
|
3 years ago |
|
wangxianzhang
|
0cafa08df5
|
Merge branches 'dev_test_mq_move' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
4f1c2f77f8
|
Merge remote-tracking branch 'remotes/origin/dev_5big_coverage' into 市北master
|
3 years ago |
|
jianjun
|
0e49472ed6
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master
|
3 years ago |
|
wangxianzhang
|
1709719ea2
|
Merge branches 'dev_springlog_abandon1' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_springlog_abandon1
|
3 years ago |
|
wanggongfeng
|
8d6cb22112
|
疫苗接种点，核酸检测点 BUG
|
3 years ago |
|
jianjun
|
a81fe11a3e
|
导入居民查询时bug
|
3 years ago |
|
wanggongfeng
|
e896c620cf
|
疫苗接种点，核酸检测点 pc 管理
|
3 years ago |
|
jianjun
|
b4208530fa
|
市北heart地址不对
|
3 years ago |
|
wanggongfeng
|
da63e37192
|
疫苗接种点，核酸检测点 pc 管理
|
3 years ago |
|
wangxianzhang
|
c239f28a22
|
修复：【居民信息导入】党员信息同步到partymember库-查询家庭地址中文描述bug
|
3 years ago |
|
wanggongfeng
|
efc79f88a3
|
疫苗接种点，核酸检测点 pc 管理
|
3 years ago |
|
wangxianzhang
|
41f8482e68
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resiimport_partyinfo
|
3 years ago |
|
wangxianzhang
|
5e177952b6
|
新增：【居民信息导入】党员信息同步到partymember库。相关MQ及服务改动
|
3 years ago |
|
wanggongfeng
|
d0bf6e62c0
|
疫苗接种点，核酸检测点 优化
|
3 years ago |
|
wanggongfeng
|
8394c932db
|
疫苗接种点，核酸检测点 优化
|
3 years ago |
|
sunyuchao
|
499c0f54e9
|
Merge branch 'dev_5big_coverage'
|
3 years ago |
|
sunyuchao
|
2ac9f2efa9
|
优势资源、城市管理、重点危化、公共服务导入时同组织下名称唯一，已有数据直接更新,未改彻底，二次修改
|
3 years ago |
