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
|
4 years ago |
zhaoqifeng
|
39ca2f2271
|
Merge branch 'dev_project_statis'
|
4 years ago |
|
zhaoqifeng
|
768d0a60b6
|
网格员统计修改
|
4 years ago |
|
zhaoqifeng
|
cb37543287
|
Merge branch 'dev_project_statis'
|
4 years ago |
|
zhaoqifeng
|
c0a3010088
|
网格员统计修改
|
4 years ago |
yinzuomei
|
cb0fec563a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
4 years ago |
|
yinzuomei
|
1f9059e0d8
|
IcBulidingAddFormDTO.sort不判断孔了试试
|
4 years ago |
wangxianzhang
|
a79b27db38
|
Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
6b140198c9
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
0bf2aebac4
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
4 years ago |
|
wangxianzhang
|
255e6e1e97
|
【五大图层】企事业单位巡查，search条件没有判空
|
4 years ago |
|
yinzuomei
|
9044cf996f
|
Merge remote-tracking branch 'origin/dev_five_coverage'
|
4 years ago |
|
yinzuomei
|
989416985e
|
try
|
4 years ago |
|
yinzuomei
|
b6ef693ba8
|
Merge remote-tracking branch 'origin/dev_five_coverage'
|
4 years ago |
|
yinzuomei
|
a0bb593b48
|
try
|
4 years ago |
|
jianjun
|
52120e1778
|
5
|
4 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
|
4 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
|
4 years ago |
|
wangxianzhang
|
07504d21d5
|
Merge branch 'dev_bugfix_ljj'
|
4 years ago |
|
wangxianzhang
|
6e05d0969c
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
d3e93bfce4
|
【政策找人】修复：年龄-不为空，报NumberFormatException
|
4 years ago |
|
wangxianzhang
|
615f8a8a6b
|
【政策找人】修复：年龄-不为空，报NumberFormatException
|
4 years ago |
zxc
|
d230318120
|
emm
|
4 years ago |
|
wangxianzhang
|
4275d40cbc
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
wangxianzhang
|
fa1a116aa4
|
【政策找人】查询列表动作，支持传入is_null/is_not_null
|
4 years ago |
|
yinzuomei
|
01e3dc01ab
|
colVal可空
|
4 years ago |
|
wangxianzhang
|
937edaf4f7
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
4 years ago |
|
wangxianzhang
|
9c5a9c7151
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
c5de446d1d
|
【五大图层】支持"其他"类型志愿者的查询
|
4 years ago |
|
wangxianzhang
|
b854cb0db6
|
Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
|
4 years ago |
|
yinzuomei
|
a9db5a1768
|
editStaffInit少的代码
|
4 years ago |
|
zxc
|
66837173a5
|
缓存删除改用deleteByPattern
|
4 years ago |
|
zxc
|
f7ed152f01
|
删除全部缓存
|
4 years ago |
|
jianjun
|
2b0d73d0dc
|
Merge remote-tracking branch 'remotes/origin/dev_project_statis'
|
4 years ago |
|
wangxianzhang
|
ba26fef667
|
Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
|
4 years ago |
|
wangxianzhang
|
e1745f5f46
|
【五大图层】居民信息接口新增"居民类别名称"列返回，字符串
|
4 years ago |
|
zhaoqifeng
|
e196e82e5d
|
检索条件精确到时分秒
|
4 years ago |
|
zxc
|
7ad11b6b09
|
搜索微调
|
4 years ago |
|
jianjun
|
5e7c7a27f1
|
分页参数 位置下移
|
4 years ago |
|
wangxianzhang
|
d649b71b4c
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
4 years ago |
|
wangxianzhang
|
e816f0fcb3
|
【五大图层】居民信息接口新增"居民类别"列返回，是个字典
|
4 years ago |
syc
|
96ae97f70e
|
联建单位列表改为按创建时间倒序
|
4 years ago |
|
zhaoqifeng
|
0a8549bfa6
|
project_process添加STAFF_NAME字段
|
4 years ago |
|
wangxianzhang
|
3f04beace2
|
Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
|
4 years ago |
|
zhaoqifeng
|
a82d83a7a2
|
project_process添加STAFF_NAME字段
|
4 years ago |
|
wangxianzhang
|
f3ae0708a2
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
yinzuomei
|
bb04455f5a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
4 years ago |
|
yinzuomei
|
35dc6be063
|
网格员服务电话接口调整
|
4 years ago |
|
zhaoqifeng
|
4bd96bb615
|
project_process添加STAFF_NAME字段
|
4 years ago |
|
syc
|
6ff3803a00
|
默认性别为男
|
4 years ago |
