jianjun
|
937c1db3bc
|
Merge remote-tracking branch 'remotes/origin/dev_project_process'
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
3 years ago |
Jackwang
|
fd66d1d7b4
|
Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register
|
3 years ago |
|
Jackwang
|
255711a6f0
|
生成小区二维码调整
|
3 years ago |
HAHA
|
9057c17187
|
bug
|
3 years ago |
wanggongfeng
|
ef0a32fe4b
|
信息采集审核
|
3 years ago |
|
wanggongfeng
|
1b10a3a854
|
Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register
|
3 years ago |
|
wanggongfeng
|
efa43f4ce0
|
信息采集审核
|
3 years ago |
syc
|
2c78a9e163
|
。
|
3 years ago |
|
Jackwang
|
37856b2b02
|
生成小区二维码；批量生成
|
3 years ago |
zhaoqifeng
|
39ca2f2271
|
Merge branch 'dev_project_statis'
|
3 years ago |
|
zhaoqifeng
|
768d0a60b6
|
网格员统计修改
|
3 years ago |
|
HAHA
|
ddb23776aa
|
党建宣传-全部-新增-发布范围 修改排序
|
3 years ago |
|
syc
|
3042fc5cf7
|
。
|
3 years ago |
|
syc
|
02c8376402
|
。
|
3 years ago |
|
wanggongfeng
|
b6197c0be9
|
信息采集审核
|
3 years ago |
|
zhaoqifeng
|
cb37543287
|
Merge branch 'dev_project_statis'
|
3 years ago |
|
zhaoqifeng
|
c0a3010088
|
网格员统计修改
|
3 years ago |
|
syc
|
c9998ad0aa
|
bug修改
|
3 years ago |
|
wanggongfeng
|
80de751404
|
信息采集审核
|
3 years ago |
|
HAHA
|
36bf8b3d95
|
党建宣传-全部-新增-发布范围 排序
|
3 years ago |
|
wanggongfeng
|
95c7d9eee0
|
信息采集审核
|
3 years ago |
|
wanggongfeng
|
2f6b6aaacc
|
信息采集审核
|
3 years ago |
|
syc
|
ff8c484bcd
|
增加返参
|
3 years ago |
|
HAHA
|
d5f995dbfb
|
党建宣传-全部-新增-发布范围 排序拼写错误
|
3 years ago |
zhangyuan
|
6a2de9a42d
|
访客登出
|
3 years ago |
yinzuomei
|
cb0fec563a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
HAHA
|
7047e85924
|
党建宣传-全部-新增-发布范围 排序
|
3 years ago |
|
yinzuomei
|
1f9059e0d8
|
IcBulidingAddFormDTO.sort不判断孔了试试
|
3 years ago |
|
Jackwang
|
d1799a3f6a
|
调整备注
|
3 years ago |
|
syc
|
c8f27c0d9a
|
程序调整
|
3 years ago |
|
wanggongfeng
|
c372f2821e
|
Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register
|
3 years ago |
|
wanggongfeng
|
553942d330
|
信息采集审核
|
3 years ago |
|
zhangyuan
|
7e7991978d
|
job增加插件调用
|
3 years ago |
|
HAHA
|
66077a8c52
|
房屋信息-左侧树 排序
|
3 years ago |
wangxianzhang
|
a79b27db38
|
Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
6b140198c9
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
syc
|
ed589583bd
|
数字平台 项目管理列表、导出
|
3 years ago |
|
HAHA
|
b1d3dd3b0e
|
房屋信息-新增/修改-所属网格 排序
|
3 years ago |
|
wangxianzhang
|
0bf2aebac4
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
3 years ago |
|
wangxianzhang
|
255e6e1e97
|
【五大图层】企事业单位巡查，search条件没有判空
|
3 years ago |
|
HAHA
|
aeaa72034d
|
房屋信息-新增/修改-所属网格 排序
|
3 years ago |
|
HAHA
|
5203923936
|
人房统计-查询-所属组织 恢复
|
3 years ago |
|
HAHA
|
0e24166151
|
人房统计-查询-所属组织 排序
|
3 years ago |
|
Jackwang
|
6c159d7090
|
访客详情
|
3 years ago |
|
syc
|
c72bd68047
|
数字平台 项目管理列表、导出
|
3 years ago |
|
syc
|
ee839d8a0c
|
数字平台 项目管理列表、导出
|
3 years ago |
|
HAHA
|
7090a2f7ed
|
居民信息-列表 排序
|
3 years ago |
|
Jackwang
|
3a9d02364f
|
居民信息采集-详情
|
3 years ago |
|
HAHA
|
a5edb2df6e
|
居民信息，所属网格排序
|
3 years ago |
|
wanggongfeng
|
264e5320a9
|
Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
# epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
|
3 years ago |
