jianjun
|
a47f896a94
|
合并冲突解决
|
3 years ago |
|
jianjun
|
e24b1865ce
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北测试
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml
# epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-heart/epmet-heart-server/pom.xml
# epmet-module/gov-access/gov-access-server/pom.xml
# epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
# epmet-module/gov-org/gov-org-server/pom.xml
# epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/pom.xml
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.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
|
3 years ago |
|
jianjun
|
c8687b17ff
|
Merge remote-tracking branch 'remotes/origin/back' into 市北测试
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.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
|
3 years ago |
|
jianjun
|
7ad42b1037
|
Merge remote-tracking branch 'remotes/origin/dev_resi_export' into 市北测试
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
|
3 years ago |
|
jianjun
|
6736ef1f1f
|
Merge remote-tracking branch 'remotes/origin/dev_resi_export' into dev
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
3 years ago |
zhaoqifeng
|
86023faa67
|
个人信息
|
3 years ago |
|
jianjun
|
14cbe024d9
|
合并冲突解决
|
3 years ago |
|
jianjun
|
5a151ab746
|
Merge remote-tracking branch 'remotes/origin/back' into dev
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.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
|
3 years ago |
|
jianjun
|
e88a9f13f1
|
Merge remote-tracking branch 'remotes/origin/dev_resi_export' into dev
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
|
3 years ago |
yinzuomei
|
f9bbcb5605
|
修改房屋，删除房屋缓存
|
3 years ago |
|
zhaoqifeng
|
1459a2b36d
|
房屋管理左侧树排序
|
3 years ago |
zxc
|
3575b1f2f9
|
sort
|
3 years ago |
|
zhaoqifeng
|
f9d4b2c406
|
房屋管理左侧树排序
|
3 years ago |
|
yinzuomei
|
9a82f4a645
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
yinzuomei
|
747ba74425
|
listresi排序调整1
|
3 years ago |
|
jianjun
|
47daf2a736
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export
|
3 years ago |
|
jianjun
|
274212eca1
|
返回支持添加
|
3 years ago |
|
zhaoqifeng
|
ac71a67c31
|
居民防疫信息排序
|
3 years ago |
|
yinzuomei
|
bf48aef8b6
|
listresi排序调整
|
3 years ago |
|
jianjun
|
47623547b2
|
返回支持添加
|
3 years ago |
|
yinzuomei
|
51cb74e77f
|
信息采集详情
|
3 years ago |
|
jianjun
|
f810d5f819
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
jianjun
|
59770de0cb
|
只合并改合并的
|
3 years ago |
|
zxc
|
cd81ac7b6a
|
url
|
3 years ago |
wangxianzhang
|
58093e0b03
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export
|
3 years ago |
|
wangxianzhang
|
7b9300be4c
|
居民信息导入的时候，对datapicker和datarange空间的内容进行正则解析判断，和格式转换
|
3 years ago |
|
jianjun
|
95ace290f7
|
隐藏列原始值加密
|
3 years ago |
|
jianjun
|
4303f3cc64
|
do语句被短路
|
3 years ago |
|
jianjun
|
49d92147ad
|
添加设置列宽策略
|
3 years ago |
|
zxc
|
c6b32326fd
|
楼栋，房屋列表新增倒序正序传参
|
3 years ago |
|
zxc
|
1caf1b9244
|
楼栋，房屋列表新增倒序正序传参
|
3 years ago |
|
jianjun
|
d4d995e2eb
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
jianjun
|
929aea9565
|
获取需求分类
|
3 years ago |
|
zxc
|
eb9ce1cb89
|
楼栋修改
|
3 years ago |
|
zxc
|
d036bad723
|
Merge branch 'dev_import_edit' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export
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/controller/IcResiUserController.java
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
3 years ago |
|
zxc
|
8a81223eb6
|
模板修改
|
3 years ago |
|
zhaoqifeng
|
0c17491316
|
个人档案-家庭关系bug修改
|
3 years ago |
|
yinzuomei
|
705ba77687
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
yinzuomei
|
7d2af1fb1d
|
居民信息列表导出增加ic_resi_user.id desc
|
3 years ago |
|
zxc
|
ae6746dbdd
|
楼栋导出添加 楼长信息，新增修改sort接口
|
3 years ago |
|
wangxianzhang
|
27a9f00ab0
|
=60岁的也是老年人
|
3 years ago |
|
zxc
|
c7adc6c71e
|
导入修改
|
3 years ago |
|
zxc
|
d5e952e4b2
|
房屋排序
|
3 years ago |
|
zxc
|
d0bc110a56
|
房屋排序
|
3 years ago |
|
zxc
|
df919f5121
|
楼栋排序
|
3 years ago |
zhangyuan
|
cf126e6f6d
|
Merge branch 'back_contract' into back
|
3 years ago |
|
zhangyuan
|
59481feec8
|
更改附件实体类的字段
|
3 years ago |
|
zhangyuan
|
45f814c3b0
|
Merge branch 'back_contract' into back
|
3 years ago |
|
zhangyuan
|
bc683f5f85
|
更新接收tokendto
|
3 years ago |
|
jianjun
|
b818dec118
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into back
|
3 years ago |
