wangxianzhang
|
6ab8fa7dbd
|
Merge branches 'dev_compare_data' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
|
3 years ago |
|
wangxianzhang
|
c1dd0ffc24
|
平阴联动平台的地址改一下
|
3 years ago |
yinzuomei
|
d54baf4d2d
|
Merge remote-tracking branch 'origin/dev_renhu'
|
3 years ago |
|
yinzuomei
|
eecc42b098
|
/data/aggregator/org/staff-select-list禁用的不展示
|
3 years ago |
zxc
|
6c0e816541
|
行程上报拉取
|
3 years ago |
|
zxc
|
6999878ed9
|
行程上报拉取暂提
|
3 years ago |
|
zxc
|
b0c7b23fdb
|
行程上报拉取暂提
|
3 years ago |
sunyuchao
|
90ccc25bb3
|
烟台行程上报
|
3 years ago |
|
wangxianzhang
|
432009a3b6
|
sql中key超长无法执行
|
3 years ago |
|
wangxianzhang
|
a26dde3a2c
|
注释掉同步Processor，到了需要的分支再打开
|
3 years ago |
|
wangxianzhang
|
4f467cd754
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
|
3 years ago |
|
wangxianzhang
|
4cbb92204a
|
flyway脚本版本调整
|
3 years ago |
|
wangxianzhang
|
9cfa49774c
|
居民信息导入模板，表头不见了，刚找回来
|
3 years ago |
|
sunyuchao
|
a8476a44e0
|
表新增字段
|
3 years ago |
|
wangxianzhang
|
27d2732373
|
job增加CpAuth
|
3 years ago |
|
wangxianzhang
|
b90bcca33f
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
zxc
|
099e18159a
|
Merge remote-tracking branch 'origin/dev_compare_data'
|
3 years ago |
|
sunyuchao
|
0ae40521ba
|
迁入管理‘详细地址’改为非必填项
|
3 years ago |
|
wangxianzhang
|
b6f7e6f546
|
job增加CpAuth
|
3 years ago |
|
yinzuomei
|
f9999a69f8
|
getDeathList bugfix，来源于小寨子需求。
|
3 years ago |
|
yinzuomei
|
2d289b63c9
|
Merge remote-tracking branch 'origin/dev_renhu'
|
3 years ago |
|
yinzuomei
|
263d01ce52
|
房屋信息-小区列表排序调整为先按照网格id升序，来源于小寨子需求
|
3 years ago |
|
wangxianzhang
|
8cf3e1adab
|
Merge branches 'master' and 'pingyin_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
Conflicts:
epmet-user/epmet-user-server/pom.xml
|
3 years ago |
|
yinzuomei
|
cfb4535ae6
|
社区查询搜索居民支持模糊搜索
|
3 years ago |
|
wangxianzhang
|
ef4e64c8e3
|
补充sync_job表的flyway脚本
|
3 years ago |
|
wangxianzhang
|
3ec38f8d64
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
43cace1816
|
抽象数据同步模块，封装部分逻辑
|
3 years ago |
|
yinzuomei
|
cd9097dc5c
|
IC_RESI_USER
|
3 years ago |
|
yinzuomei
|
c5d061c286
|
Merge remote-tracking branch 'origin/dev_renhu'
|
3 years ago |
|
yinzuomei
|
2031b00a2e
|
selectListResiMap小寨子写死排序
|
3 years ago |
|
yinzuomei
|
06afefd7af
|
Merge remote-tracking branch 'origin/dev_renhu'
|
3 years ago |
|
yinzuomei
|
6962566bcf
|
事件管理列表查询
|
3 years ago |
|
yinzuomei
|
c9842b4f81
|
注释
|
3 years ago |
|
wangxianzhang
|
024d16412e
|
Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_compare_data
|
3 years ago |
|
zxc
|
05d1ecf58d
|
根组织pid=0
|
3 years ago |
|
yinzuomei
|
824b783c04
|
数字社区初始化接口调整
|
3 years ago |
|
yinzuomei
|
f989b014f2
|
ic_form_item_group增加GROUP_CODE
|
3 years ago |
|
yinzuomei
|
b914d179bc
|
Merge remote-tracking branch 'origin/wxz_resi_house_stats'
# Conflicts:
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SubUserHouseListResultDTO.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
|
3 years ago |
|
yinzuomei
|
fc475bfc5d
|
Merge remote-tracking branch 'origin/dev_renhu'
|
3 years ago |
|
yinzuomei
|
9a474878fc
|
人户状况
|
3 years ago |
|
yinzuomei
|
3181da191e
|
Merge remote-tracking branch 'origin/dev_compare_data'
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
|
3 years ago |
|
yinzuomei
|
096bfb13f8
|
Merge remote-tracking branch 'origin/dev_renhu'
|
3 years ago |
|
yinzuomei
|
1405eac691
|
89__
|
3 years ago |
|
yinzuomei
|
5879763f78
|
Merge remote-tracking branch 'origin/dev_renhu'
|
3 years ago |
|
wangxianzhang
|
b05bb82f44
|
解决疫苗接种的数据重复问题
|
3 years ago |
|
wangxianzhang
|
e09e955b6b
|
解决疫苗接种的数据重复问题
|
3 years ago |
|
zxc
|
fb97450752
|
人户列表
|
3 years ago |
|
zxc
|
ed5697aad2
|
改改名字
|
3 years ago |
|
wangxianzhang
|
599de384d9
|
解决疫苗接种的数据重复问题
|
3 years ago |
|
zxc
|
bdcf94109a
|
is
|
3 years ago |
