jianjun
|
af693ff65c
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_mp
Conflicts:
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
|
4 years ago |
|
jianjun
|
725566f373
|
事件回复防重复
|
4 years ago |
zxc
|
d60e31ce99
|
字段名
|
4 years ago |
|
zxc
|
4696132e0e
|
emm 缓存
|
4 years ago |
|
zxc
|
e780fd7853
|
a
|
4 years ago |
zhaoqifeng
|
e9a1162f04
|
项目实时抽取 添加参数projectId
|
4 years ago |
|
zxc
|
da94759408
|
douhao
|
4 years ago |
|
zxc
|
5da3b40d93
|
douhao
|
4 years ago |
|
jianjun
|
e6371512f1
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
9ab37a1e3d
|
去掉没用的参数
|
4 years ago |
|
zxc
|
addf625b08
|
表决调整
|
4 years ago |
|
jianjun
|
9a1e45e293
|
微调
|
4 years ago |
|
jianjun
|
859e283bf8
|
实时抽取项目数据部分 添加 objectid有针对性的处理数据 extractProjectPeriodData,extractProjectCategory部分修改完毕
|
4 years ago |
|
zhaoqifeng
|
876c967e07
|
项目实时抽取 添加参数projectId
|
4 years ago |
|
zxc
|
862970e811
|
表决中议题详情——支持、反对数修改
|
4 years ago |
|
jianjun
|
f2a85da553
|
实时抽取项目数据部分 添加 objectid有针对性的处理数据 saveOriginProjectDaily部分修改完毕
|
4 years ago |
|
jianjun
|
d11efb5858
|
实时抽取项目数据部分 添加 objectid有针对性的处理数据
|
4 years ago |
|
zxc
|
7a2d7de33d
|
project
|
4 years ago |
|
zxc
|
01fbb451d9
|
project
|
4 years ago |
|
zxc
|
4da5fead8f
|
判断客户下是不是存在一级分类
|
4 years ago |
|
jianjun
|
b86dffd87a
|
暂时解决内存溢出问题 后续重写优化
|
4 years ago |
|
jianjun
|
2b5358886d
|
代码扫描出的 高级问题
|
4 years ago |
|
jianjun
|
ddf2ac2ff8
|
微调
|
4 years ago |
|
jianjun
|
8d2d25be2e
|
微调
|
4 years ago |
|
jianjun
|
3963916031
|
干掉那个报错的
|
4 years ago |
|
jianjun
|
ad6d8eb00a
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_ic_mp
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
|
4 years ago |
|
jianjun
|
de4903426d
|
代码清理
|
4 years ago |
sunyuchao
|
7b1e152bbf
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
sunyuchao
|
fbeb2e18ab
|
不扶墙也得服你
|
4 years ago |
|
zxc
|
11f07950d1
|
预约修改
|
4 years ago |
yinzuomei
|
8ed2e8c902
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
yinzuomei
|
2699f67ce1
|
需求发送消息。
|
4 years ago |
|
sunyuchao
|
36f32aa223
|
project库sql
|
4 years ago |
|
sunyuchao
|
6a67498d54
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
sunyuchao
|
8d91213f7a
|
.
|
4 years ago |
|
jianjun
|
75b1220834
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_ic_mp
|
4 years ago |
|
jianjun
|
27be013b2d
|
日志级别调整
|
4 years ago |
|
jianjun
|
0563b38102
|
日志级别调整
|
4 years ago |
|
sunyuchao
|
6d5531e076
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
sunyuchao
|
f034060dd9
|
事件保存查询
|
4 years ago |
|
jianjun
|
1c87a9d0b8
|
去掉默认赋值根组织中心点
|
4 years ago |
wangxianzhang
|
56ceafd039
|
fix
|
4 years ago |
|
wangxianzhang
|
d46ac4de41
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
wangxianzhang
|
e3bfd50fde
|
修改：
三个接口customerId参数的使用逻辑调整
|
4 years ago |
|
jianjun
|
4b0264ef65
|
去掉 默认跟组织的中心点
|
4 years ago |
|
wangxianzhang
|
0bcb12f842
|
修改：
/screen/index/advancedbranchrank
report/screen/user/partypointrank
user/userpointrank/withoutpartymember
增加customerId可选参数
|
4 years ago |
|
wangxianzhang
|
a3d299884b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
yinzuomei
|
afd9b1e6ee
|
pc完成需求调整
|
4 years ago |
|
jianjun
|
8f0b81b16d
|
修改楼宇排序 先按创建时间 再按楼宇名称；房屋排序将单元号转为数字排
|
4 years ago |
|
yinzuomei
|
174f54863f
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
