yinzuomei
|
24435dbb75
|
house/houselist放开
|
3 years ago |
zhangyuan
|
ee8c9e2fc0
|
flayway
|
3 years ago |
|
zhangyuan
|
65fb771d8b
|
调整
|
3 years ago |
|
yinzuomei
|
97ae52f67a
|
huifu
|
3 years ago |
|
yinzuomei
|
9246e6df13
|
listresi试试
|
3 years ago |
|
zhangyuan
|
9447f08b10
|
完善
|
3 years ago |
HAHA
|
4336747fb6
|
修改返回字段名
|
3 years ago |
|
HAHA
|
0404255b42
|
获取详情时同时获取网格排序字段
|
3 years ago |
wanggongfeng
|
2547be29f8
|
Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register
|
3 years ago |
|
wanggongfeng
|
22c3c91036
|
信息采集审核bug
|
3 years ago |
|
zhangyuan
|
9000b5fc05
|
bug
|
3 years ago |
|
zhangyuan
|
379b5de228
|
bug
|
3 years ago |
|
zhangyuan
|
4f1507e3ec
|
bug
|
3 years ago |
|
zhangyuan
|
73b8e29da6
|
导出
|
3 years ago |
|
HAHA
|
76195208f6
|
修改排序规则
|
3 years ago |
jianjun
|
7158f46c92
|
Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22'
# 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
|
3 years ago |
|
jianjun
|
0f6f7a616c
|
Merge remote-tracking branch 'origin/pingyin_master' into pingyin_master
|
3 years ago |
|
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 |
|
zhangyuan
|
8211995f2f
|
增删改查
|
3 years ago |
|
zhangyuan
|
edaae5330a
|
回显
|
3 years ago |
|
HAHA
|
b9631f647f
|
修改排序规则
|
3 years ago |
|
HAHA
|
3fd33e497c
|
修改排序规则
|
3 years ago |
|
zhangyuan
|
8ffccb9d5e
|
附件处理
|
3 years ago |
|
HAHA
|
035102c0ed
|
修改排序规则
|
3 years ago |
Jackwang
|
098b9ec2a2
|
我的登记列表添加审核原因
|
3 years ago |
|
yinzuomei
|
caa74b8ede
|
恢复
|
3 years ago |
zxc
|
3a3262ab73
|
调整
|
3 years ago |
|
zhangyuan
|
15952e24e4
|
bug
|
3 years ago |
syc
|
ba880d5c9c
|
Merge branch 'dev_project_hd_syc' into dev_jmreport
|
3 years ago |
|
zhangyuan
|
559cb71db0
|
bug
|
3 years ago |
|
yinzuomei
|
dd9e7cea8e
|
test
|
3 years ago |
|
zhangyuan
|
85643b0daa
|
完善
|
3 years ago |
|
zxc
|
5b3dde38ed
|
暂提
|
3 years ago |
|
zhangyuan
|
8d888d3940
|
完善保存
|
3 years ago |
|
yinzuomei
|
ccd9c8c5d3
|
orgProjectDetailList试下这个接口
|
3 years ago |
|
yinzuomei
|
0f05bf924f
|
合丢了吗？
|
3 years ago |
|
yinzuomei
|
127c10d6cb
|
Merge remote-tracking branch 'origin/dev_jmreport' into dev_jmreport
|
3 years ago |
|
yinzuomei
|
46b0781fde
|
fanhui key
|
3 years ago |
|
zhangyuan
|
741e15b7d1
|
bug
|
3 years ago |
wangxianzhang
|
ac7fc2032b
|
【报表】增加AOP拦截器，和对应的注解，用于拦截url参数，给具有@RequestBody注解的入参赋值
|
3 years ago |
|
zhangyuan
|
5845ebe6bb
|
Merge branch 'feature/visitor_zhy'
|
3 years ago |
|
zhangyuan
|
6bcca8cb4d
|
ddd
|
3 years ago |
|
wangxianzhang
|
3cdb180a7d
|
Merge branch 'dev_jmreport' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jmreport
|
3 years ago |
|
wangxianzhang
|
217e299291
|
【报表】增加AOP拦截器，和对应的注解，用于拦截url参数，给具有@RequestBody注解的入参赋值
|
3 years ago |
|
zxc
|
a391d13fae
|
编辑暂提
|
3 years ago |
|
yinzuomei
|
4156c3648b
|
删除没用的
|
3 years ago |
|
yinzuomei
|
353a5e45a6
|
Merge remote-tracking branch 'origin/dev_jmreport' into dev_jmreport
# Conflicts:
# epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcCustomerReportController.java
# epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcCustomerReportService.java
# epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java
|
3 years ago |
|
yinzuomei
|
e2ed87a469
|
功能类别字典
|
3 years ago |
|
Jackwang
|
b03bea4745
|
居民信息采集详情添加社区id
|
3 years ago |
