jianjun
|
9941f9cd62
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
5 years ago |
|
jianjun
|
8901b693c7
|
拉人小组成就
|
5 years ago |
yinzuomei
|
51510b0b3a
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
yinzuomei
|
fae7378cd9
|
活动详情修改
|
5 years ago |
|
jianjun
|
2959046b91
|
小组成就详情 返回 是否达到字段
|
5 years ago |
|
yinzuomei
|
b70667d651
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
yinzuomei
|
7743947efa
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
yinzuomei
|
35cf271bef
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
yinzuomei
|
ca82d57073
|
bugfix
|
5 years ago |
sunyuchao
|
ae286e9880
|
Merge branch 'dev_group_act_notice' into dev_temp
|
5 years ago |
|
sunyuchao
|
4b6d1e5a0c
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
jianjun
|
99b9079da1
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
5 years ago |
|
jianjun
|
978c0aa398
|
Merge remote-tracking branch 'remotes/origin/dev_time_out' into dev_temp
|
5 years ago |
|
sunyuchao
|
b750e2c933
|
添加错误码
|
5 years ago |
|
jianjun
|
f898bff7aa
|
Merge remote-tracking branch 'origin/dev_group_point' into dev_group_point
|
5 years ago |
|
jianjun
|
fc1fa9447a
|
小组成员逻辑为调整为所有成员
|
5 years ago |
|
yinzuomei
|
66f7328fdf
|
签到入参校验
|
5 years ago |
|
yinzuomei
|
c8f53f45bd
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
yinzuomei
|
7ccc066571
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
yinzuomei
|
7eada58795
|
组长默认已读状态
|
5 years ago |
|
sunyuchao
|
e29ac384ec
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
sunyuchao
|
6760e37ec0
|
通知过期后不允许编辑，阅读也不再算是已读
|
5 years ago |
zhaoqifeng
|
2500482e1b
|
用户积分行为记录数据修改，添加sourceType，填充sourceId
|
5 years ago |
|
yinzuomei
|
14927c56ea
|
关闭之后查看活动，不更改已读状态。
|
5 years ago |
|
jianjun
|
28e6d52fbc
|
添加代码注释
|
5 years ago |
|
zhaoqifeng
|
a30c038f3b
|
Merge branch 'dev_group_point' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
91b0d2a785
|
用户积分行为记录数据修改，添加sourceType，填充sourceId
|
5 years ago |
|
zhaoqifeng
|
751fbb70ce
|
Merge branch 'dev_group_point' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
|
5 years ago |
|
zhaoqifeng
|
1aee827651
|
用户积分行为记录数据修改，添加sourceType，填充sourceId
|
5 years ago |
|
yinzuomei
|
9fe09e323e
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
yinzuomei
|
73c90445ff
|
bug fix
|
5 years ago |
|
jianjun
|
378844f726
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
5 years ago |
|
jianjun
|
2669c4426d
|
添加判断解决异常
|
5 years ago |
|
jianjun
|
9c45ccf8f3
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
5 years ago |
|
jianjun
|
d2d53da859
|
事务添加
|
5 years ago |
|
yinzuomei
|
2d422fcea5
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
yinzuomei
|
87f8245d50
|
publish act
|
5 years ago |
|
jianjun
|
f3b20d3ad0
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
|
5 years ago |
|
jianjun
|
0baa38af48
|
小组成员成就 只统计小组成员除了组长之外的人
|
5 years ago |
zxc
|
9b16101acc
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
zxc
|
3366200bae
|
创建小组修改
|
5 years ago |
|
zhaoqifeng
|
20591a9ae3
|
Merge branch 'dev_group_point' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
9bbd4a6534
|
小组成就相关接口
|
5 years ago |
|
zxc
|
3c1c31a34e
|
时间样式 i
|
5 years ago |
|
yinzuomei
|
fcaf59f5f9
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
yinzuomei
|
1beb784daa
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
5 years ago |
|
jianjun
|
7f3c93de50
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
# epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
|
5 years ago |
|
yinzuomei
|
4a86700a3c
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
jianjun
|
d23bc04fb1
|
小组成员成就 只统计小组成员除了组长之外的人
|
5 years ago |
|
yinzuomei
|
820272b7cc
|
selectLatestTen
|
5 years ago |
