yinzuomei
|
03f3d25c8b
|
Merge remote-tracking branch 'origin/dev_0521yzm' into dev
|
4 years ago |
|
yinzuomei
|
456c9376bb
|
热心居民审核报错fix
|
4 years ago |
|
yinzuomei
|
ab30139cbb
|
热心居民审核报错fix
|
4 years ago |
|
yinzuomei
|
f9b7e14c4a
|
添加组织，修改组织，同一个pid，不允许重名. 2
|
4 years ago |
jianjun
|
36b6bba9cd
|
查询添加客户Id
|
4 years ago |
|
yinzuomei
|
bce5879b5a
|
群成员列表修改
|
4 years ago |
|
yinzuomei
|
ef37c82141
|
群成员列表修改
|
4 years ago |
|
yinzuomei
|
85b743fbbb
|
Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev
|
4 years ago |
zxc
|
e4ac157a74
|
emm bug
|
4 years ago |
|
zxc
|
2c776eb409
|
不全项目评价统计修改
|
4 years ago |
|
zxc
|
bfae3fabdf
|
ID修改
|
4 years ago |
|
yinzuomei
|
92616539c2
|
Merge remote-tracking branch 'origin/dev_bug_group_member_name' into dev
|
4 years ago |
|
yinzuomei
|
bfba7c19ff
|
Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev
|
4 years ago |
|
zxc
|
798c1b80aa
|
name
|
4 years ago |
|
zxc
|
27c525f026
|
组员名字修改
|
4 years ago |
|
zxc
|
0996b8726c
|
啊哈哈
|
4 years ago |
|
zxc
|
1d6f16178d
|
项目结案添加项目评价初始化数据
|
4 years ago |
sunyuchao
|
d956f30461
|
解决生产上平音提出的下级实际超过十个组织，总数却最大只显示十个的问题【代码被修改过造成的】
|
4 years ago |
|
zxc
|
4485a303ed
|
添加customerId
|
4 years ago |
|
zxc
|
e757d4234c
|
..
|
4 years ago |
|
zxc
|
42d192bdb2
|
项目评价统计补全
|
4 years ago |
|
yinzuomei
|
4d24dc0a56
|
bug
|
4 years ago |
|
yinzuomei
|
08de8e3b88
|
项目详情接口调整
|
4 years ago |
|
yinzuomei
|
61fb99325f
|
category-analysis接口修改
|
4 years ago |
|
zxc
|
669e6e59ee
|
补全 项目评价时，添加项目评价统计
|
4 years ago |
|
yinzuomei
|
5df0dc3f6d
|
level=1
|
4 years ago |
|
yinzuomei
|
5ee01fc4a9
|
monthId:yyyyMM
|
4 years ago |
|
yinzuomei
|
20650c06ff
|
advancedbranchrank接口调整
|
4 years ago |
|
yinzuomei
|
bd7d9ffb92
|
contactmasslinechart接口修改
|
4 years ago |
|
yinzuomei
|
c3729bcfad
|
议题的应表态人数sql修改。
|
4 years ago |
|
yinzuomei
|
e48ba66433
|
这个接口没法整
|
4 years ago |
|
yinzuomei
|
e8ae300f09
|
添加点注释
|
4 years ago |
|
yinzuomei
|
23517e4cd2
|
项目详情接口修改v2
|
4 years ago |
|
yinzuomei
|
8bfc64d014
|
项目详情接口修改
|
4 years ago |
|
yinzuomei
|
54bebb245f
|
项目采集、处理进展采集接口调整
|
4 years ago |
|
jianjun
|
0193c0d870
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
7e19b2d45e
|
bigDecimal除法添加四舍五入
|
4 years ago |
|
sunyuchao
|
2b3dca202c
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
sunyuchao
|
7ef4095de4
|
Merge branch 'dev_group_act_notice' into dev
|
4 years ago |
|
sunyuchao
|
a7f045f94a
|
生产bug修改
|
4 years ago |
|
jianjun
|
182d489eb0
|
IndexOutOfBoundsException 修改
|
4 years ago |
|
jianjun
|
498b4ae3b9
|
错误修改
|
4 years ago |
|
jianjun
|
0b3f88d1a0
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
9089eb3c1e
|
小组成就合并
|
4 years ago |
|
zxc
|
8afd91c97d
|
screen_index_data_monthly代码微调
|
4 years ago |
|
jianjun
|
032b98b94a
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
# 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/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/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
|
4 years ago |
|
zxc
|
8245dd3dfb
|
screen_index_data_monthly数据插入代码微调
|
4 years ago |
|
jianjun
|
4404c0a137
|
添加描述
|
4 years ago |
|
sunyuchao
|
4083bf051c
|
Merge branch 'dev_group_act_notice' into dev
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java
|
4 years ago |
|
jianjun
|
ac13c9567e
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
