jianjun
|
d1bbc2241f
|
描述修改
|
4 years ago |
|
jianjun
|
f4e58c3480
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_staff_info
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.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
|
4 years ago |
zhaoqifeng
|
d2c4e43e68
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
a9e3160cd9
|
党员认证防重复提交
|
4 years ago |
zxc
|
abc9af1f11
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
f6f7bee82e
|
工作人员调动
|
4 years ago |
|
zxc
|
4a34dcf6bc
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
28d8c5aee7
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
694e28a32a
|
徽章地址查询
|
4 years ago |
|
zxc
|
5b5b468ac2
|
Merge remote-tracking branch 'origin/dev_staff_info' into develop
|
4 years ago |
sunyuchao
|
34581f076f
|
接口逻辑调整
|
4 years ago |
yinzuomei
|
31ff8d5f80
|
Merge remote-tracking branch 'origin/dev_staff_info' into develop
|
4 years ago |
|
yinzuomei
|
341ad6e0c3
|
回复列表
|
4 years ago |
|
yinzuomei
|
8d554ef2ef
|
Merge remote-tracking branch 'origin/dev_staff_info' into develop
|
4 years ago |
|
yinzuomei
|
ed6eb9be60
|
woshoudaode
|
4 years ago |
|
yinzuomei
|
7f4c254b21
|
Merge remote-tracking branch 'origin/dev_staff_info' into develop
|
4 years ago |
|
yinzuomei
|
e729cbb1ff
|
dev
|
4 years ago |
|
yinzuomei
|
58eb20b7c1
|
Merge remote-tracking branch 'origin/dev_staff_info' into develop
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.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
|
4 years ago |
|
yinzuomei
|
dc3d236466
|
详情
|
4 years ago |
|
yinzuomei
|
22aa410077
|
myreceived
|
4 years ago |
|
yinzuomei
|
9d2361e59f
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java
|
4 years ago |
|
yinzuomei
|
fab731eb5b
|
mysent
|
4 years ago |
|
jianjun
|
29aee85d01
|
地址修改
|
4 years ago |
|
jianjun
|
f67f1ea1f6
|
微调
|
4 years ago |
|
jianjun
|
bdd006f0d2
|
微调
|
4 years ago |
|
jianjun
|
f70d397c42
|
缓存key调整
|
4 years ago |
|
jianjun
|
bed190232d
|
bug修改
|
4 years ago |
|
jianjun
|
d01422d410
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
|
4 years ago |
|
jianjun
|
2b279651ff
|
CustomerStaffRedis调整为静态方法 无需注入直接使用
|
4 years ago |
|
sunyuchao
|
6e8bd6fe69
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
|
4 years ago |
|
zxc
|
54bc6913ed
|
【发送消息】我收到、我发送红点
|
4 years ago |
|
sunyuchao
|
7c3e4c60be
|
程序补缺
|
4 years ago |
|
yinzuomei
|
0609547ee8
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
|
4 years ago |
|
jianjun
|
87668f1804
|
待修改
|
4 years ago |
|
yinzuomei
|
5df83046a9
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
|
4 years ago |
|
yinzuomei
|
3590210020
|
info表的content增加全文索引
|
4 years ago |
|
sunyuchao
|
460f684904
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
|
4 years ago |
|
sunyuchao
|
2a4fae8799
|
脚本调整
|
4 years ago |
|
sunyuchao
|
1afe985ce6
|
脚本调整
|
4 years ago |
|
zxc
|
f7839c30a5
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
|
4 years ago |
|
zxc
|
3b159e3c6b
|
【发送消息】我收到、我发送红点
|
4 years ago |
|
jianjun
|
65dc7fa8c1
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
|
4 years ago |
|
jianjun
|
fb0b753d7e
|
更正地址
|
4 years ago |
|
sunyuchao
|
59cd4ab394
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
|
4 years ago |
|
sunyuchao
|
8fdafb6229
|
【通讯录】人员详情v2
|
4 years ago |
|
jianjun
|
5190df4002
|
删除无用的redis 类
|
4 years ago |
|
jianjun
|
6d4fd0918e
|
修改redis key
|
4 years ago |
|
jianjun
|
08ffe39470
|
修改注释
|
4 years ago |
|
jianjun
|
1905977530
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
|
4 years ago |
|
jianjun
|
6fc9cb85b0
|
删除无用方法
|
4 years ago |
