jianjun
|
d7685db2e3
|
Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master
|
3 years ago |
jianjun
|
fa9836e394
|
日志4 - match
|
3 years ago |
jianjun
|
61d97d42ab
|
Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master
# Conflicts:
# epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
|
3 years ago |
jianjun
|
836e629464
|
日志3
|
3 years ago |
jianjun
|
9e38c0ec38
|
日志2
|
3 years ago |
jianjun
|
fb76917f79
|
日志
|
3 years ago |
jianjun
|
8a1aba189e
|
日志
|
3 years ago |
jianjun
|
6adb956ccc
|
Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master
|
3 years ago |
jianjun
|
8b0bc572c2
|
登陆接口 添加缓存 存24小时吧
|
3 years ago |
jianjun
|
e5520edf63
|
Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master
|
3 years ago |
jianjun
|
13404133d2
|
登陆接口 添加缓存
|
3 years ago |
jianjun
|
d3c8ac31dc
|
Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master
|
3 years ago |
jianjun
|
98b22ff8c4
|
登陆接口 添加缓存和线程池执行
|
3 years ago |
jianjun
|
8e4461a8bf
|
fegin没有线程池的 配上
|
3 years ago |
jianjun
|
8c47fb1009
|
crm 也没有
|
3 years ago |
jianjun
|
ac2a1a3d30
|
Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master
|
3 years ago |
jianjun
|
3307063871
|
通过账号登陆 方法优化
|
3 years ago |
jianjun
|
b2815d7482
|
通过账号登陆 方法优化
|
3 years ago |
jianjun
|
8dc1728d40
|
Merge remote-tracking branch 'remotes/origin/master' into dev_fegin_concurrent
|
3 years ago |
jianjun
|
6931ca0841
|
Merge remote-tracking branch 'remotes/origin/feature/py_loginaccount'
|
3 years ago |
jianjun
|
dde84a6c3d
|
合并多余方法
|
3 years ago |
jianjun
|
e23c7b6a91
|
Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master
# Conflicts:
# 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
|
3 years ago |
jianjun
|
487536a69e
|
auth fegin添加线程池
|
3 years ago |
zxc
|
690784b080
|
a
|
3 years ago |
zxc
|
8ebccd13c3
|
a
|
3 years ago |
zxc
|
558ecac8cb
|
a
|
3 years ago |
zxc
|
ac9cc2f091
|
a
|
3 years ago |
zxc
|
f172f7dc60
|
a
|
3 years ago |
zxc
|
86fc9c41d5
|
a
|
3 years ago |
zxc
|
7cf0214500
|
a
|
3 years ago |
zxc
|
5c6b538bce
|
加了个网格
|
3 years ago |
zxc
|
c7a0d10a58
|
加了个网格
|
3 years ago |
zxc
|
802a723bef
|
bug
|
3 years ago |
zxc
|
1dcdf6cd1a
|
bug
|
3 years ago |
zxc
|
e0e69d3976
|
bug
|
3 years ago |
zxc
|
cc84e4e304
|
a
|
3 years ago |
zxc
|
6ca58cc68b
|
a
|
3 years ago |
zxc
|
2bbd1b875d
|
sql脚本
|
3 years ago |
wangxianzhang
|
21dbf58f63
|
居民类别-居民列表-排序按照创建时间倒序+name升序
|
3 years ago |
wangxianzhang
|
7538334560
|
居民信息导入模板-民族从家庭信息挪到基础信息
|
3 years ago |
wangxianzhang
|
012023d12a
|
人房统计信息-排序改为和管理平台房屋列表相同的
|
3 years ago |
wangxianzhang
|
a141951306
|
居民防疫信息列表,按照疫苗-核酸次数降序排序
|
3 years ago |
wangxianzhang
|
7d7d74bfe0
|
items查询增加del_flag='0'
|
3 years ago |
wangxianzhang
|
0cadd5a4f4
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
sunyuchao
|
61bcf9b10d
|
Merge branch 'dev_renwu700_syc'
|
3 years ago |
sunyuchao
|
05a1ed431f
|
房屋名称
|
3 years ago |
sunyuchao
|
ca7e30a23b
|
Merge branch 'dev_renwu700_syc'
|
3 years ago |
sunyuchao
|
e1ded8b49d
|
。。。
|
3 years ago |
wangxianzhang
|
2496c3115d
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
sunyuchao
|
16ccd16991
|
房屋新增、修改时名字带'单元'二字
|
3 years ago |