jianjun
|
4656841226
|
Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22' into pingyin_master
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
# epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java
|
3 years ago |
|
jianjun
|
d67be733a3
|
组织code 变更时 发送消息携带 修改前的code，便于同步平阴数据时处理
|
3 years ago |
|
jianjun
|
5e7c7a27f1
|
分页参数 位置下移
|
3 years ago |
|
jianjun
|
0c610581fa
|
Merge remote-tracking branch 'remotes/origin/dev_project_statis' into pingyin_master
# Conflicts:
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
# epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.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
|
3 years ago |
|
jianjun
|
a74a11a9cc
|
Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22' into pingyin_master
|
3 years ago |
zhaoqifeng
|
a8097c9569
|
总计 人均
|
3 years ago |
sunyuchao
|
567db6d50c
|
数据同步部分参数赋值
|
3 years ago |
|
jianjun
|
1611024a2f
|
Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22' into pingyin_master
|
3 years ago |
|
sunyuchao
|
041efbcbf6
|
数据同步部分参数赋值
|
3 years ago |
|
jianjun
|
f9b25b90b1
|
Merge branch 'dev_pingyin_7_22' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
|
3 years ago |
|
jianjun
|
622b585bb5
|
删除状态默认为N 以及更新时间 更新时 更新
|
3 years ago |
|
jianjun
|
a10488f44f
|
Merge branch 'dev_pingyin_7_22' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
|
3 years ago |
|
jianjun
|
79fcfbadc7
|
删除状态默认为N 以及更新时间 更新时 更新
|
3 years ago |
|
jianjun
|
be1b9d33c0
|
Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22' into pingyin_master
|
3 years ago |
|
jianjun
|
46137f924e
|
删除状态默认为N
|
3 years ago |
|
jianjun
|
5d9f607465
|
Merge branch 'dev_pingyin_7_22' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
|
3 years ago |
|
jianjun
|
f23b9f9ec3
|
删除状态默认为N
|
3 years ago |
|
jianjun
|
57cdb37023
|
Merge branch 'dev_pingyin_7_22' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master
|
3 years ago |
|
jianjun
|
b2713613d8
|
字典编码
|
3 years ago |
|
zhaoqifeng
|
c0ffb08f68
|
返回组织类型
|
3 years ago |
|
zhaoqifeng
|
8171753a5c
|
网格员项目统计排序
|
3 years ago |
|
zhaoqifeng
|
70f2785143
|
组织项目统计,网格员项目统计
|
3 years ago |
|
zhaoqifeng
|
ceaec34b3a
|
组织项目统计,网格员项目统计
|
3 years ago |
|
zhaoqifeng
|
c632e652b5
|
组织项目统计,网格员项目统计
|
3 years ago |
|
zhaoqifeng
|
e6eabdde06
|
组织项目统计,网格员项目统计
|
3 years ago |
|
zhaoqifeng
|
ab6072c1ce
|
组织项目统计,网格员项目统计
|
3 years ago |
|
zhaoqifeng
|
9243f4e334
|
组织项目统计,网格员项目统计
|
3 years ago |
|
zhaoqifeng
|
88420ebd93
|
组织项目统计
|
3 years ago |
|
jianjun
|
196eb9f197
|
Merge remote-tracking branch 'remotes/origin/dev_policy_service'
|
3 years ago |
wangxianzhang
|
41c95f9823
|
【政策】修复
|
3 years ago |
yinzuomei
|
eea11e5da9
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
422a130faa
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
3 years ago |
|
yinzuomei
|
c856d4647b
|
个人档案上报事件接口调整
|
3 years ago |
|
jianjun
|
c26e248a97
|
Merge remote-tracking branch 'remotes/origin/dev_policy_service'
|
3 years ago |
|
jianjun
|
8de692dfae
|
Merge remote-tracking branch 'remotes/origin/dev_fangzhu'
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java
|
3 years ago |
|
wangxianzhang
|
7b159e8d6b
|
【政策】修复
|
3 years ago |
|
wangxianzhang
|
09b3ee4ca0
|
【政策】修复
|
3 years ago |
|
wangxianzhang
|
c7d77cffcf
|
【政策】修复分页varchar类型的birthday接收问题
|
3 years ago |
|
wangxianzhang
|
05b6a6b611
|
【政策】修复分页varchar类型的birthday接收问题
|
3 years ago |
|
zhaoqifeng
|
497291bacd
|
房主相关修改
|
3 years ago |
|
wangxianzhang
|
c0176da35c
|
【政策】修复分页问题
|
3 years ago |
|
wangxianzhang
|
f03ba75eb2
|
Merge branch 'dev_policy_service' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_policy_service
|
3 years ago |
|
jianjun
|
e4e749eccb
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
2a1bc01040
|
居民导出优化
|
3 years ago |
|
jianjun
|
8ac3de8d21
|
Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22' into pingyin_master
|
3 years ago |
|
sunyuchao
|
9cadbc8e5e
|
程序调整优化
|
3 years ago |
|
yinzuomei
|
fa150c76dc
|
weiyi
|
3 years ago |
|
jianjun
|
b91d7e5750
|
Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22' into pingyin_master
|
3 years ago |
|
sunyuchao
|
7024fc9994
|
程序调整优化
|
3 years ago |
zxc
|
57eaea7688
|
新增serviceCategoryKey字段，发起服务接口修改，查询列表修改
|
3 years ago |
