sunyuchao
|
f13fe881e5
|
代码合并问题
|
4 years ago |
|
sunyuchao
|
12cc05a3dd
|
Merge branch 'dev_group_act_notice' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
|
4 years ago |
zxc
|
b86634ea02
|
小组历史数据添加未读数
|
4 years ago |
|
zxc
|
1776b4d84b
|
isChanged修改
|
4 years ago |
|
sunyuchao
|
71b56c81d8
|
isChanged改为true false
|
4 years ago |
|
zxc
|
7484ca70cb
|
为 if，else添加大括号
|
4 years ago |
|
sunyuchao
|
487d82f48c
|
Merge branch 'dev_group_act_notice' into dev_temp
|
4 years ago |
|
sunyuchao
|
caa46d0a6f
|
接口调整 不在吧通知详情与阅读放在一起
|
4 years ago |
|
sunyuchao
|
6d5282b4c5
|
Merge branch 'dev_group_act_notice' into dev_temp
|
4 years ago |
|
sunyuchao
|
a7c616dada
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
4 years ago |
|
sunyuchao
|
c3c2a68482
|
bug修改
|
4 years ago |
yinzuomei
|
6b8266ea5d
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
475432542b
|
工作端查看活动详情
|
4 years ago |
|
sunyuchao
|
789af45fdd
|
Merge branch 'dev_group_act_notice' into dev_temp
|
4 years ago |
|
sunyuchao
|
b27533c27a
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
4 years ago |
|
sunyuchao
|
cd47bb5a36
|
查询通知详情时修改阅读状态
|
4 years ago |
|
yinzuomei
|
129b35e182
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
3c9b4a77e1
|
修改grouptypelist接口，优先查询当前客户，如果当前客户没有配置，默认查询default。
|
4 years ago |
|
yinzuomei
|
87452500a4
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
cced40e2f6
|
修改grouptypelist接口，优先查询当前客户，如果当前客户没有配置，默认查询default。
|
4 years ago |
|
yinzuomei
|
ea23f0b4df
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
4521a47e5d
|
我创建的小组，返参增加groupType
|
4 years ago |
|
yinzuomei
|
09cfd1df2e
|
编辑小组信息-组名不能超过20
|
4 years ago |
|
sunyuchao
|
c8378b0ccc
|
Merge branch 'dev_group_act_notice' into dev_temp
|
4 years ago |
|
sunyuchao
|
60ca399254
|
小组名称最多20字符
|
4 years ago |
zhaoqifeng
|
843dfe4b6f
|
Merge branch 'dev_project_real_time_statistics' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
29e6fffd41
|
项目实时统计消息
|
4 years ago |
|
yinzuomei
|
d2ba6e3e3d
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
4e335188aa
|
工作端查看活动详情
|
4 years ago |
|
yinzuomei
|
924cdc65dd
|
加个返参，方便看数据
|
4 years ago |
|
yinzuomei
|
139277c5e5
|
工作端查看活动详情
|
4 years ago |
|
yinzuomei
|
18bd1aab4e
|
修改"projectdistribution" 方法,level必填
|
4 years ago |
|
yinzuomei
|
4ce24c9541
|
修改"projectdistribution" 方法,绿灯，显示近30天数据
|
4 years ago |
|
yinzuomei
|
6fa7143023
|
修改"projectdistribution" 方法
|
4 years ago |
jianjun
|
ab4cb50a84
|
Merge remote-tracking branch 'remotes/origin/dev_project_real_time_statistics' into dev_temp
# Conflicts:
# epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
|
4 years ago |
|
jianjun
|
967777be73
|
添加项目变动消息类型发送
|
4 years ago |
|
sunyuchao
|
fa114dea77
|
Merge branch 'dev_group_act_notice' into dev_temp
|
4 years ago |
|
sunyuchao
|
83ef47c76a
|
bug
|
4 years ago |
|
sunyuchao
|
b8d0d0a10e
|
Merge branch 'dev_group_act_notice' into dev_temp
|
4 years ago |
|
sunyuchao
|
674cf45c1a
|
议题详情接口按组类型返回真实姓名bug
|
4 years ago |
|
zhaoqifeng
|
b75f5029ff
|
Merge branch 'dev_project_real_time_statistics' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
32632686ab
|
大屏事件级别统计逻辑修改
|
4 years ago |
|
zxc
|
2d169aafd9
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
zxc
|
cc3cd519bf
|
readFlag修改 VIEW_DETAIL
|
4 years ago |
|
zxc
|
62922b8b48
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
zxc
|
9d6b7cbf89
|
代码微调
|
4 years ago |
|
sunyuchao
|
45f2b50ff3
|
通知阅读状态添加过期后阅读的状态
|
4 years ago |
|
zxc
|
0188cab0e6
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
|
4 years ago |
|
zxc
|
4de03750be
|
代码微调
|
4 years ago |
|
jianjun
|
ead06f2c50
|
Merge remote-tracking branch 'remotes/origin/dev_project_real_time_statistics' into dev_temp
|
4 years ago |
