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 |
|
jianjun
|
d49fdf513a
|
修改密码接口 修改app
|
3 years ago |
|
jianjun
|
2c8c91433b
|
修改密码接口 修改方法
|
3 years ago |
|
jianjun
|
bb7b791dd7
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
3 years ago |
|
jianjun
|
ec3981e40a
|
修改密码接口
|
3 years ago |
sunyuchao
|
77db6d47ef
|
Merge branch 'dev_bugfix_ljj' into back
|
3 years ago |
|
sunyuchao
|
bac2917190
|
应前端要求 接口入参不再传appId值
|
3 years ago |
|
jianjun
|
2da0272b44
|
添加动力主轴服务 2
|
3 years ago |
|
jianjun
|
199416f7c6
|
添加动力主轴服务
|
3 years ago |
|
zhangyuan
|
af2b12cd31
|
Merge branch 'back' of http://121.42.41.42:7070/r/epmet-cloud into back
|
3 years ago |
|
zhangyuan
|
fd0ffff2b4
|
合同管理代码
|
3 years ago |
|
jianjun
|
e8799c1232
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into back
|
3 years ago |
|
yinzuomei
|
28e3d7c64d
|
/api/gov/org/customergrid/gridoption放开权限
|
3 years ago |
|
zhangyuan
|
b540c5ca6d
|
丢失的代码
|
3 years ago |
|
zhangyuan
|
a41a92030f
|
Merge branch 'master' into dev_contract
|
3 years ago |
|
zhangyuan
|
b63e4c1c21
|
Merge branch 'dev'
|
3 years ago |
|
zhangyuan
|
8d01bec297
|
Merge branch 'develop' into dev
|
3 years ago |
|
zhangyuan
|
73d8eb4664
|
bug
|
3 years ago |
|
zhangyuan
|
fee3e5cfae
|
Merge branch 'dev'
# Conflicts:
# 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 |
|
zhangyuan
|
1f13a4a13b
|
Merge branch 'dev_contract' into dev
|
3 years ago |
|
jianjun
|
8cb6a23b64
|
微调
|
3 years ago |
|
jianjun
|
1f944cf58f
|
Merge remote-tracking branch 'remotes/origin/dev'
# Conflicts:
# 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
|
ae949b6adc
|
Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop
# 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-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/impl/IcResiUserServiceImpl.java
|
3 years ago |
|
jianjun
|
429cf2841e
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_resi_export
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
# 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/service/HouseService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
# 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/controller/IcResiUserController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
3 years ago |
|
zhaoqifeng
|
538d97d87d
|
Merge branch 'dev_bugfix_ljj' into dev
|
3 years ago |
|
jianjun
|
e6017c4465
|
这个代码被删除了 恢复
|
3 years ago |
|
zhaoqifeng
|
45267e787c
|
Merge branch 'dev_bugfix_ljj' into develop
|
3 years ago |
|
zhaoqifeng
|
022c7acba3
|
list转map key重复
|
3 years ago |
|
jianjun
|
25cea0f695
|
Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop
|
3 years ago |
|
jianjun
|
edfe9b063c
|
导出返回错误信息 2
|
3 years ago |
|
jianjun
|
8a137c95d1
|
Merge remote-tracking branch 'origin/develop' into develop
|
3 years ago |
