yinzuomei
|
ca96a3f348
|
网格相关：党员参加“三会一课”人次
|
5 years ago |
zxc
|
df72dae365
|
项目评价分数DTO
|
5 years ago |
zhaoqifeng
|
827b66b4cc
|
小组成员添加是否党员身份
|
5 years ago |
|
yinzuomei
|
3b9ca27d03
|
网格相关：组织”三会一课“次数
|
5 years ago |
|
zxc
|
5aa6328ebc
|
Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
|
5 years ago |
|
yinzuomei
|
bb2b3eede9
|
zancun
|
5 years ago |
|
zxc
|
4485a303ed
|
添加customerId
|
5 years ago |
|
zxc
|
e757d4234c
|
..
|
5 years ago |
|
zxc
|
42d192bdb2
|
项目评价统计补全
|
5 years ago |
sunyuchao
|
caee4b0ce9
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
|
5 years ago |
|
sunyuchao
|
6cf0f40b6d
|
dada_aggregator引入data_statistical数据源
|
5 years ago |
|
yinzuomei
|
3640f3740b
|
党员相关：参加三一会一课次数joinThreeMeetsCount字段赋值 sql修改
|
5 years ago |
|
yinzuomei
|
9108b5ef31
|
党员相关：参加三一会一课次数joinThreeMeetsCount字段赋值
|
5 years ago |
|
yinzuomei
|
4d24dc0a56
|
bug
|
5 years ago |
|
yinzuomei
|
08de8e3b88
|
项目详情接口调整
|
5 years ago |
|
yinzuomei
|
61fb99325f
|
category-analysis接口修改
|
5 years ago |
|
sunyuchao
|
1d0f29b3fa
|
群组数统计代码调整
|
5 years ago |
|
zxc
|
669e6e59ee
|
补全 项目评价时，添加项目评价统计
|
5 years ago |
|
yinzuomei
|
5df0dc3f6d
|
level=1
|
5 years ago |
|
yinzuomei
|
5ee01fc4a9
|
monthId:yyyyMM
|
5 years ago |
|
sunyuchao
|
55f78905d1
|
Merge branch 'dev_third_data' into dev_temp
|
5 years ago |
|
sunyuchao
|
fd18dc33c7
|
程序调整
|
5 years ago |
|
yinzuomei
|
20650c06ff
|
advancedbranchrank接口调整
|
5 years ago |
|
sunyuchao
|
5b19aa56c0
|
Merge branch 'dev_third_data' into dev_temp
|
5 years ago |
|
sunyuchao
|
3d4560c155
|
bug
|
5 years ago |
|
sunyuchao
|
c4c4f1eeb8
|
小组基础数据统计及fact_origin_group_main_daily表新增groupType字段
|
5 years ago |
|
yinzuomei
|
bd7d9ffb92
|
contactmasslinechart接口修改
|
5 years ago |
|
yinzuomei
|
c3729bcfad
|
议题的应表态人数sql修改。
|
5 years ago |
|
yinzuomei
|
e48ba66433
|
这个接口没法整
|
5 years ago |
|
sunyuchao
|
e43a933f23
|
Merge branch 'dev_group_act_notice' into dev_temp
|
5 years ago |
|
yinzuomei
|
e8ae300f09
|
添加点注释
|
5 years ago |
|
yinzuomei
|
23517e4cd2
|
项目详情接口修改v2
|
5 years ago |
|
yinzuomei
|
8bfc64d014
|
项目详情接口修改
|
5 years ago |
|
yinzuomei
|
54bebb245f
|
项目采集、处理进展采集接口调整
|
5 years ago |
|
zhaoqifeng
|
2f80310edc
|
Merge branch 'dev_out_group' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
919a9f1635
|
Merge branch 'dev_topic_locate' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
547a3dfb3d
|
话题定位
|
5 years ago |
|
zhaoqifeng
|
3de49b63c4
|
退出群组
|
5 years ago |
|
zhaoqifeng
|
80f2c32a41
|
Merge branch 'dev_topic_locate' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# 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/dao/ResiGroupDao.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/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.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
# epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
|
5 years ago |
|
zhaoqifeng
|
f4fc39fa26
|
Merge remote-tracking branch 'origin/dev_topic_locate' into dev_topic_locate
|
5 years ago |
|
zhaoqifeng
|
ce767363a8
|
话题定位
|
5 years ago |
jianjun
|
0193c0d870
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
5 years ago |
|
zxc
|
7e19b2d45e
|
bigDecimal除法添加四舍五入
|
5 years ago |
|
sunyuchao
|
2b3dca202c
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
sunyuchao
|
7ef4095de4
|
Merge branch 'dev_group_act_notice' into dev
|
5 years ago |
|
sunyuchao
|
a7f045f94a
|
生产bug修改
|
5 years ago |
|
jianjun
|
182d489eb0
|
IndexOutOfBoundsException 修改
|
5 years ago |
|
jianjun
|
498b4ae3b9
|
错误修改
|
5 years ago |
|
jianjun
|
0b3f88d1a0
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
5 years ago |
|
jianjun
|
9089eb3c1e
|
小组成就合并
|
5 years ago |
