zxc
|
d3a5b09624
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
4 years ago |
|
zxc
|
b71e3dab92
|
小组历史数据查询添加是否过期字段
近十条数据添加 是否过期字段
|
4 years ago |
yinzuomei
|
57ef5a7c46
|
SHOULD_READ
|
4 years ago |
|
yinzuomei
|
09a9323d53
|
Merge remote-tracking branch 'origin/dev_0421bug_yzm' into dev_temp
|
4 years ago |
|
yinzuomei
|
705b064d86
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
a773dc0910
|
MESSAGE_ID
|
4 years ago |
|
yinzuomei
|
b414e50cc9
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
f011fe21c6
|
bug fix
|
4 years ago |
sunyuchao
|
f61b573e32
|
Merge branch 'dev_group_act_notice' into dev_temp
|
4 years ago |
jianjun
|
2fc44c37b3
|
组员入组消息发送
|
4 years ago |
|
sunyuchao
|
4a0a337583
|
需求变更添加通知过期时间引起的代码变化
|
4 years ago |
|
sunyuchao
|
db35fa98b1
|
需求变更添加通知过期时间引起的代码变化
|
4 years ago |
|
yinzuomei
|
650e61f135
|
返参增加monthId/dataEndTime,方便知道数据所属月
|
4 years ago |
|
yinzuomei
|
7f99539841
|
安宁大屏返参增加monthId,方便知道数据所属月
|
4 years ago |
|
jianjun
|
22da3840f4
|
小组成就消息消费代码
|
4 years ago |
|
yinzuomei
|
49c1848058
|
签到码界面修改
|
4 years ago |
|
yinzuomei
|
205b8204c4
|
group_message 历史数据sql
|
4 years ago |
|
jianjun
|
5edde68f6f
|
代码暂存
|
4 years ago |
|
jianjun
|
c552a44f7f
|
代码暂存
|
4 years ago |
|
jianjun
|
5a51e2253f
|
代码暂存
|
4 years ago |
|
yinzuomei
|
7cd8c5a7fb
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
|
4 years ago |
|
yinzuomei
|
6b13f7c131
|
back
|
4 years ago |
|
yinzuomei
|
a8c854c894
|
修改selectGovernCapacityRatioNew 排序
|
4 years ago |
|
jianjun
|
b74bc32b93
|
计算小组成就放入到小组成就表
|
4 years ago |
|
jianjun
|
3c5f10c738
|
新的代码暂存
|
4 years ago |
|
yinzuomei
|
cbec07d0b7
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
4 years ago |
|
yinzuomei
|
ec23370d22
|
效率分析排序
|
4 years ago |
|
yinzuomei
|
f54b83d033
|
暂存
|
4 years ago |
|
jianjun
|
52948ca63a
|
平阴联动平台域名更换
|
4 years ago |
zhaoqifeng
|
8fbbfe8445
|
Merge branch 'dev_group_point' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
75a31fc9e7
|
小组成就相关接口
|
4 years ago |
|
sunyuchao
|
19edd1c2c0
|
代码合并问题
|
4 years ago |
|
zxc
|
8d8b76f875
|
小组历史数据查询，未完待续
|
4 years ago |
|
sunyuchao
|
e4abc55f55
|
Merge branch 'dev_group_act_notice' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
|
4 years ago |
|
sunyuchao
|
469268347e
|
因新增组内消息记录表引起的程序变动(新增话题、自动审核、组长审核、屏蔽、取消屏蔽、关闭、删除组员)
|
4 years ago |
|
yinzuomei
|
56cdaa827a
|
Merge remote-tracking branch 'origin/dev_0421bug_yzm' into dev
|
4 years ago |
|
yinzuomei
|
245d4aa445
|
bug修改
|
4 years ago |
|
zxc
|
795a159078
|
小组历史数据查询，未完待续
|
4 years ago |
|
zhaoqifeng
|
631859ae93
|
Merge branch 'dev_partymember_bug' into dev_temp
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java
|
4 years ago |
|
zhaoqifeng
|
5c310392c2
|
党员认证判断是否是居民代码修改
|
4 years ago |
|
zhaoqifeng
|
0205258072
|
小组成就相关接口
|
4 years ago |
|
zhaoqifeng
|
0dc4f0648f
|
Merge branch 'dev_group_point' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
# 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/topic/service/impl/ResiTopicServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
|
4 years ago |
|
jianjun
|
89aa8a9e1e
|
小组成就类型枚举类
|
4 years ago |
|
sunyuchao
|
812cdc3571
|
小组通知添加关于组内消息记录表的维护
|
4 years ago |
|
yinzuomei
|
33aa2ba8fd
|
group_message
|
4 years ago |
|
yinzuomei
|
a8fb260144
|
group_message
|
4 years ago |
|
yinzuomei
|
b53077a856
|
group_message
|
4 years ago |
|
yinzuomei
|
eaceda8ed1
|
发布、编辑、取消、关闭活动记录group_message
|
4 years ago |
|
yinzuomei
|
fd314eebec
|
发布、编辑、取消、关闭活动记录group_message
|
4 years ago |
|
zhaoqifeng
|
ea26719820
|
Merge branch 'dev_partymember_bug' into dev_temp
|
4 years ago |
