lichao
|
09e628d136
|
Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
|
3 years ago |
|
lichao
|
0916cce841
|
组织开通
|
3 years ago |
yinzuomei
|
e8b16f1d91
|
街镇返回区县
|
3 years ago |
曲树通
|
75d0c88306
|
补充
|
3 years ago |
|
曲树通
|
7c7ff00420
|
调整
|
3 years ago |
wxz
|
ec1c4dba4b
|
Merge branch 'wxz_bug_fix'
|
3 years ago |
|
wxz
|
2f22870337
|
代码写法调整，不重要
|
3 years ago |
|
yinzuomei
|
0cf3af35d8
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
3 years ago |
|
yinzuomei
|
66d543e9a0
|
注释
|
3 years ago |
|
曲树通
|
944b8a7a51
|
补充
|
3 years ago |
|
wxz
|
2c00e196af
|
Merge branch 'wxz_bug_fix'
|
3 years ago |
|
wxz
|
e731e686b8
|
fix:解决居民信息多选导致的一系列问题。。。。头发掉光了
|
3 years ago |
|
曲树通
|
4f43d087e1
|
导出
|
3 years ago |
|
wxz
|
01117e768b
|
Merge branch 'wxz_bug_fix'
|
3 years ago |
|
wxz
|
e202417a9d
|
fix：居民信息导出
|
3 years ago |
|
曲树通
|
c092c37e15
|
活跃度统计计算
|
3 years ago |
|
yinzuomei
|
d1b3ecdc45
|
orgId
|
3 years ago |
|
yinzuomei
|
9952976aa6
|
and
|
3 years ago |
|
yinzuomei
|
e3b2c9f302
|
街镇、区县
|
3 years ago |
|
wxz
|
89cb57abfa
|
Merge branch 'wxz_bug_fix'
|
3 years ago |
|
yinzuomei
|
20e05cc072
|
社区调整
|
3 years ago |
|
wxz
|
14fa4f64a1
|
fix：初始化"指挥调度"的时候，将sql中缺少的字段补全
|
3 years ago |
|
wxz
|
bc90dcd82d
|
fix：居民信息导出-gridIds
|
3 years ago |
|
yinzuomei
|
d4525b4e53
|
柱子
|
3 years ago |
|
wxz
|
9d4aa553be
|
fix：居民信息导出-staffOrgPaths
|
3 years ago |
|
yinzuomei
|
4ab42c4dc1
|
kaishijieshu
|
3 years ago |
|
wxz
|
8bb9e3efd2
|
修改：居民信息-所属房屋(小区列表)，根据所属组织调整为多选，将接口也修改为支持agencyIds/gridIds
|
3 years ago |
|
yinzuomei
|
d764bd8db1
|
kaishijieshu
|
3 years ago |
|
yinzuomei
|
6d3496d78a
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master
|
3 years ago |
|
yinzuomei
|
c59a56e09b
|
level
|
3 years ago |
|
wxz
|
c84d31ea7e
|
补充YanTaiTripReportSyncProcessor的@Component
|
3 years ago |
|
wxz
|
896f6d9925
|
Merge branch 'master' into yantai_zhengwu_master
|
3 years ago |
|
wxz
|
8dc146eb80
|
Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master
|
3 years ago |
|
wxz
|
a8d531ea20
|
Merge branch 'wxz_bug_fix'
|
3 years ago |
|
wxz
|
784551dd0b
|
修复:1.ic_event，事件处理分析查询中，缺少del_flag='0'的bug
|
3 years ago |
|
yinzuomei
|
4a3b8375f1
|
level
|
3 years ago |
|
wxz
|
4a04905845
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
yinzuomei
|
bee178b830
|
查询市级账号/区县级账号/镇街级账号/社区级账号登录次数
|
3 years ago |
|
yinzuomei
|
36ca5271b6
|
插入登录日志记录test
|
3 years ago |
|
yinzuomei
|
d646c1244b
|
staff_login_log
|
3 years ago |
|
yinzuomei
|
aaaad8ce70
|
Merge remote-tracking branch 'origin/房屋tree_yzm'
|
3 years ago |
|
yinzuomei
|
87a8ad5fc8
|
登录或者退出content不一致
|
3 years ago |
|
yinzuomei
|
562cf269ea
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master
|
3 years ago |
|
yinzuomei
|
0af33c7ad2
|
烟台徽章认证，不校验验证码
|
3 years ago |
|
yinzuomei
|
5d242ab0e4
|
/resi/mine/badge/operlist，已申请，未审核通过的，"isCertificated": "no"
|
3 years ago |
|
yinzuomei
|
53584a65b6
|
/resi/mine/badge/operlist返回状态
|
3 years ago |
|
yinzuomei
|
2a01e968b2
|
/resi/mine/badge/operlist返回时间和状态
|
3 years ago |
|
yinzuomei
|
490390f9fc
|
/resi/mine/badge/operlist返回时间和状态
|
3 years ago |
|
yinzuomei
|
cca2afca31
|
/heart/icpartyactivity/search
|
3 years ago |
|
yinzuomei
|
78be98f049
|
/heart/icpartyactivity/search
|
3 years ago |
