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 |
|
wanggongfeng
|
7f2c15cc9a
|
信息采集审核
|
3 years ago |
|
HAHA
|
c877fba359
|
居民信息，所属网格排序
|
3 years ago |
|
HAHA
|
06d2c4b62b
|
添加排序条件
|
3 years ago |
|
Jackwang
|
cb0d237ef4
|
我的登记列表
|
3 years ago |
|
syc
|
afedc08ea3
|
数字平台 项目管理列表、导出
|
3 years ago |
|
Jackwang
|
d183c82529
|
访客登记
|
3 years ago |
|
Jackwang
|
6142cc5570
|
居民信息采集-新增/更新
|
3 years ago |
|
wanggongfeng
|
c39f31ba65
|
信息采集审核
|
3 years ago |
|
Jackwang
|
7f8c3e1219
|
Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register
|
3 years ago |
|
Jackwang
|
c2bf56a10d
|
居民信息采集补充字段
|
3 years ago |
yinzuomei
|
9044cf996f
|
Merge remote-tracking branch 'origin/dev_five_coverage'
|
3 years ago |
|
yinzuomei
|
989416985e
|
try
|
3 years ago |
|
yinzuomei
|
b6ef693ba8
|
Merge remote-tracking branch 'origin/dev_five_coverage'
|
3 years ago |
|
yinzuomei
|
a0bb593b48
|
try
|
3 years ago |
|
wanggongfeng
|
9685941f8d
|
信息采集，列表
|
3 years ago |
jianjun
|
52120e1778
|
5
|
3 years ago |
|
jianjun
|
a19277f09a
|
Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22'
# 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
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
# epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
|
3 years ago |
|
jianjun
|
4a09a0c2c9
|
Merge remote-tracking branch 'remotes/origin/dev_five_coverage'
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
|
3 years ago |
|
jianjun
|
78ea9c50cf
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master
|
3 years ago |
|
wangxianzhang
|
07504d21d5
|
Merge branch 'dev_bugfix_ljj'
|
3 years ago |
|
wangxianzhang
|
6e05d0969c
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
d3e93bfce4
|
【政策找人】修复：年龄-不为空，报NumberFormatException
|
3 years ago |
|
wangxianzhang
|
615f8a8a6b
|
【政策找人】修复：年龄-不为空，报NumberFormatException
|
3 years ago |
|
jianjun
|
99b60c7455
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master
|
3 years ago |
|
jianjun
|
76b03dee54
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/ShibeiWorkPlatform into 市北master
|
3 years ago |
|
jianjun
|
47255dfe88
|
Merge remote-tracking branch 'remotes/origin/dev_bug_select_staff' into 市北master
|
3 years ago |
zxc
|
d230318120
|
emm
|
3 years ago |
|
Jackwang
|
8d69d8008c
|
居民信息采集代码生成
|
3 years ago |
|
wangxianzhang
|
4275d40cbc
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
3 years ago |
|
wangxianzhang
|
fa1a116aa4
|
【政策找人】查询列表动作，支持传入is_null/is_not_null
|
3 years ago |
|
yinzuomei
|
01e3dc01ab
|
colVal可空
|
3 years ago |
|
wangxianzhang
|
937edaf4f7
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
3 years ago |
|
wangxianzhang
|
9c5a9c7151
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
c5de446d1d
|
【五大图层】支持"其他"类型志愿者的查询
|
3 years ago |
|
wangxianzhang
|
b854cb0db6
|
Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
|
3 years ago |
|
yinzuomei
|
a9db5a1768
|
editStaffInit少的代码
|
3 years ago |
|
zxc
|
66837173a5
|
缓存删除改用deleteByPattern
|
3 years ago |
