zxc
|
17a2a733bf
|
Merge remote-tracking branch 'origin/dev_dingding' into dev_dingding
|
3 years ago |
|
zxc
|
1e7ca19715
|
jiaoben
|
3 years ago |
zhaoqifeng
|
6b368520b6
|
注册用户
|
3 years ago |
|
zhaoqifeng
|
9df9ef89db
|
注册用户
|
3 years ago |
yinzuomei
|
309d3085c4
|
resiLoginDingTemp
|
3 years ago |
|
zxc
|
814fdf6b3b
|
emm
|
3 years ago |
|
zxc
|
056021b28b
|
缓存
|
3 years ago |
|
yinzuomei
|
4518f2972b
|
dingResiLogin
|
3 years ago |
|
yinzuomei
|
5825c6769a
|
Merge remote-tracking branch 'origin/dev_dingding' into dev_dingding
|
3 years ago |
|
yinzuomei
|
bffa8e9f35
|
/epmetuser/userbaseinfo/dingResiLogin
|
3 years ago |
|
zxc
|
9fe69ef16b
|
缓存
|
3 years ago |
sunyuchao
|
0c8cc30db7
|
接口增加返参
|
3 years ago |
|
sunyuchao
|
414b68908c
|
人员图谱-个人详情里显示的房屋信息由显示本人是房东的房屋信息改为显示当前人员居住的房屋信息
|
3 years ago |
|
yinzuomei
|
c26b2dc7f0
|
temp
|
3 years ago |
|
yinzuomei
|
7e1cc720ad
|
redis token
|
3 years ago |
jianjun
|
906f5a514b
|
Merge remote-tracking branch 'origin/dev_dingding' into dev_dingding
# Conflicts:
# epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
|
3 years ago |
|
jianjun
|
d5cc56f53e
|
third集成消息回调
|
3 years ago |
|
yinzuomei
|
580ea4447c
|
corpId不需要了
|
3 years ago |
|
yinzuomei
|
4aa139da9e
|
corpId
|
3 years ago |
|
yinzuomei
|
6a2421ed45
|
resilogin-ding
|
3 years ago |
|
zhaoqifeng
|
f42001862c
|
进入网格，自动注册居民
|
3 years ago |
wangxianzhang
|
8cbc303a32
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
zxc
|
bc89d8cc35
|
获取用户详情
|
3 years ago |
zhangyuan
|
a5446eaee2
|
Merge branch 'feature/visitor2_zhy'
|
3 years ago |
|
zhangyuan
|
3b0922ef4d
|
无用引用
|
3 years ago |
|
zhangyuan
|
44065fefd4
|
Merge branch 'feature/visitor2_zhy'
|
3 years ago |
|
zhangyuan
|
d5e70a7068
|
不再有退卡了
|
3 years ago |
|
zhangyuan
|
ff95c1befe
|
Merge branch 'feature/visitor2_zhy'
|
3 years ago |
|
zhangyuan
|
b21ff55926
|
顺德居逻辑
|
3 years ago |
|
zxc
|
9110461cb6
|
回调
|
3 years ago |
|
zxc
|
ab268ba798
|
新代码
|
3 years ago |
|
jianjun
|
89b2800faa
|
Merge remote-tracking branch 'remotes/origin/master' into dev_dingding
|
3 years ago |
|
jianjun
|
1d372aa184
|
third集成消息回调
|
3 years ago |
|
zxc
|
546488cff7
|
Merge branch 'dev_0906_new_demand'
|
3 years ago |
|
zxc
|
11a362654f
|
emm
|
3 years ago |
|
zxc
|
9924db162a
|
emm
|
3 years ago |
|
yinzuomei
|
b3d8ae3b10
|
Merge remote-tracking branch 'origin/dev_ylfn'
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
3 years ago |
|
yinzuomei
|
540204bdbc
|
Merge remote-tracking branch 'origin/dev_0906_new_demand'
|
3 years ago |
|
zxc
|
aef7cfe939
|
新字段
|
3 years ago |
|
yinzuomei
|
396103b816
|
Merge remote-tracking branch 'origin/dev_0906_new_demand'
|
3 years ago |
|
zxc
|
ebac3e2243
|
新字段
|
3 years ago |
|
zhaoqifeng
|
4b06c587f7
|
更新是否育龄妇女定时任务
|
3 years ago |
|
zhaoqifeng
|
06cc5e8ac4
|
更新是否育龄妇女定时任务
|
3 years ago |
|
yinzuomei
|
038b8c47ca
|
不等于空串
|
3 years ago |
|
zhaoqifeng
|
c14fd64161
|
更新是否育龄妇女定时任务
|
3 years ago |
|
yinzuomei
|
32547af4c7
|
Merge remote-tracking branch 'origin/dev_ic_user_houe_statis_syc'
|
3 years ago |
|
zhaoqifeng
|
71f57815e7
|
Merge branches 'dev_ylfn' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ylfn
|
3 years ago |
|
yinzuomei
|
d348a1c833
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
yinzuomei
|
2e1af3c9f5
|
Merge remote-tracking branch 'origin/dev_0906_new_demand'
|
3 years ago |
wangxianzhang
|
5bd15bb4bb
|
证件号工具类增加年龄计算
|
3 years ago |
