YUJT
|
0ce9f51dc2
|
Merge branch 'bugfix/party_manage' into master_yantai
|
4 years ago |
|
YUJT
|
3ec6558475
|
Merge branch 'feature/dev_sunjiatan' into master_yantai
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.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
|
4 years ago |
zhaoqifeng
|
27f32692a1
|
移除审核需求变动
|
4 years ago |
|
YUJT
|
819170db1c
|
Merge branch 'bugfix/party_manage' into master_yantai
|
4 years ago |
jianjun
|
b8d503ded1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 烟台master
|
4 years ago |
|
jianjun
|
229d56905d
|
疫苗查询bug
|
4 years ago |
Jackwang
|
529cdaa328
|
通过房屋编码获取信息-优化提示信息
|
4 years ago |
|
zhaoqifeng
|
8491f4d401
|
导入党员信息时获取居民地址
|
4 years ago |
|
zhaoqifeng
|
103d7c31b4
|
导入党员信息时获取居民地址
|
4 years ago |
|
YUJT
|
d71be57272
|
Merge branch 'feature/dev_zz_wgh'
|
4 years ago |
|
Jackwang
|
cbd741c165
|
双实信息录入-脚本名称调整
|
4 years ago |
|
Jackwang
|
88a8e2235f
|
双实信息录入-编码辅助表结构调整
|
4 years ago |
HAHA
|
8b09f28af5
|
增加排序
|
4 years ago |
|
HAHA
|
0a74e2f1a5
|
添加查询返回结果
|
4 years ago |
|
HAHA
|
1e0fea80c5
|
查询事件信息详情
|
4 years ago |
|
HAHA
|
ab271f9a98
|
网格化事件信息新分页接口
|
4 years ago |
|
Jackwang
|
34e3f8c1a4
|
双实信息录入-新增编码重复利用机制
|
4 years ago |
|
HAHA
|
8bc0308964
|
添加flyway脚本
|
4 years ago |
|
HAHA
|
cac670d436
|
生成代码，调用ruoyi接口获取wgh_sjxx数据
|
4 years ago |
|
zhaoqifeng
|
ad7a9189c0
|
【双实录入】统计相关接口问题修改
|
4 years ago |
wangxianzhang
|
baa78de8fa
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
zhaoqifeng
|
724c53763e
|
【双实录入】统计相关接口问题修改
|
4 years ago |
|
zhaoqifeng
|
39921761f6
|
【双实录入】统计相关接口问题修改
|
4 years ago |
sunyuchao
|
37bcff5669
|
bug修改
|
4 years ago |
|
jianjun
|
7b838cc0b8
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 烟台master
|
4 years ago |
|
jianjun
|
a0abf74dcd
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
jianjun
|
2d9198f2c3
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
4 years ago |
|
jianjun
|
813c83d2ed
|
房屋查询导出 每次1w
|
4 years ago |
wanggongfeng
|
f7ddf9a38c
|
Merge branch 'feature/dev_point_manage'
|
4 years ago |
|
wanggongfeng
|
28787af782
|
疫苗接种点，核酸检测点 添加customerId筛选
|
4 years ago |
|
Jackwang
|
0a1df33823
|
双实信息录入-房屋coding初始化赋值
|
4 years ago |
|
wanggongfeng
|
1ccd7a318a
|
Merge branch 'feature/dev_point_manage'
|
4 years ago |
|
wanggongfeng
|
72433c71b5
|
疫苗接种点，核酸检测点 添加customerId筛选
|
4 years ago |
|
jianjun
|
ef3ba79a01
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
80af8c8e66
|
房屋查询导出 每次1w
|
4 years ago |
|
Jackwang
|
779eabe9fa
|
双实信息录入-小区楼栋编辑剔除系统编码更新
|
4 years ago |
|
jianjun
|
7afc96d538
|
代码怕合并
|
4 years ago |
|
jianjun
|
b11e6f22bf
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 烟台master
|
4 years ago |
|
jianjun
|
ff805d2cb7
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
25df6e4518
|
修改查询导致 导出一户一档
|
4 years ago |
|
wangxianzhang
|
7ea7fddc96
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
wangxianzhang
|
1bf2da83ff
|
partymember 增加mq的监听
|
4 years ago |
|
jianjun
|
af2b41261b
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 烟台master
|
4 years ago |
|
jianjun
|
4fe73d0171
|
导入居民查询时bug
|
4 years ago |
|
jianjun
|
527bd9f9fb
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
jianjun
|
75b79d157d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
4 years ago |
|
jianjun
|
4515f23465
|
导入居民查询时bug
|
4 years ago |
|
wangxianzhang
|
9726c96660
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wanggongfeng
|
b596e47d39
|
Merge branch 'feature/dev_point_manage'
|
4 years ago |
|
wanggongfeng
|
85dbb9731a
|
疫苗接种点，核酸检测点 优化
|
4 years ago |
