sunyuchao
|
bf9fa53f90
|
Merge branch 'dev_oper_role' into develop
|
4 years ago |
|
sunyuchao
|
9c6e95c365
|
接口调整 客户没有设置启动页赋值默认值
|
4 years ago |
jianjun
|
7f41a1c36d
|
指标说明去掉含义 二字
|
4 years ago |
zxc
|
a009ed4919
|
Merge remote-tracking branch 'origin/dev_data_fusion' into dev_point_task
|
4 years ago |
|
sunyuchao
|
c842d363c3
|
Merge branch 'dev_oper_role' into develop
|
4 years ago |
|
sunyuchao
|
514bf41cee
|
启动页查询接口不需要token
|
4 years ago |
wxz
|
480e063fa4
|
Merge branch 'wxz_avg_samplecount' into develop
|
4 years ago |
|
wxz
|
645b07c79e
|
修复：计算指标平均值的时候，没有sample_count的问题
|
4 years ago |
|
sunyuchao
|
c3bc6ff078
|
Merge branch 'dev_oper_role' into develop
|
4 years ago |
|
sunyuchao
|
60979307ec
|
启动页配置接口首次提交
|
4 years ago |
|
zxc
|
6f80efcf3c
|
Merge remote-tracking branch 'origin/dev_point_task' into develop
|
4 years ago |
|
zxc
|
0f7efbc996
|
规则修改
|
4 years ago |
|
zxc
|
35874f736c
|
Merge branch 'dev_point_task' into develop
|
4 years ago |
|
zxc
|
148f724982
|
规则修改
|
4 years ago |
|
zxc
|
35c58ddbd5
|
Merge branch 'dev_point_task' into develop
|
4 years ago |
|
zxc
|
9edde7bc2a
|
规则修改
|
4 years ago |
|
zxc
|
cc1008bc3f
|
Merge branch 'dev_point_task' into develop
|
4 years ago |
|
zxc
|
ac77bf27af
|
true和false修改
|
4 years ago |
|
wxz
|
b4dce63396
|
Merge branch 'dev_point_task' into develop
|
4 years ago |
|
wxz
|
756a9ffdb0
|
Merge remote-tracking branch 'origin/dev_point_task' into dev_point_task
|
4 years ago |
|
wxz
|
488fae7c69
|
新增："积分规则修改"系统日志记录
|
4 years ago |
yinzuomei
|
3e0560a78d
|
Merge remote-tracking branch 'origin/dev_point_task' into develop
|
4 years ago |
|
yinzuomei
|
5db438fe5d
|
bug修改
|
4 years ago |
|
yinzuomei
|
4900efb11b
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
yinzuomei
|
eb7fe1c5fc
|
Merge remote-tracking branch 'origin/dev_point_task' into develop
# Conflicts:
# epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__point_rule_sort.sql
|
4 years ago |
|
yinzuomei
|
3598a81636
|
bug修改
|
4 years ago |
|
zxc
|
8d5230e47a
|
Merge remote-tracking branch 'origin/dev_point_task' into develop
|
4 years ago |
|
zxc
|
02756dc1ea
|
系统日志message添加
|
4 years ago |
|
yinzuomei
|
62589a57dd
|
Merge remote-tracking branch 'origin/dev_point_task' into develop
|
4 years ago |
|
yinzuomei
|
adfa631ef1
|
支持查询历史日期
|
4 years ago |
|
zxc
|
fb167188f3
|
..
|
4 years ago |
|
yinzuomei
|
f027a0cd0b
|
Merge remote-tracking branch 'origin/dev_point_task' into develop
|
4 years ago |
|
yinzuomei
|
7786e99ffa
|
upLimitCount=0代表无上限次数
|
4 years ago |
|
yinzuomei
|
81d1c0a675
|
Merge remote-tracking branch 'origin/dev_point_task' into develop
# Conflicts:
# epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java
# epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java
# epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
# epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml
|
4 years ago |
|
yinzuomei
|
29a285642d
|
Merge remote-tracking branch 'origin/dev_point_task' into dev_point_task
|
4 years ago |
|
yinzuomei
|
e1db211d9e
|
积分任务列表
|
4 years ago |
|
zxc
|
18e9346e58
|
积分规则修改
|
4 years ago |
|
yinzuomei
|
c66ed71fcf
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
55993c4815
|
积分任务列表
|
4 years ago |
|
jianjun
|
488c12209c
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
676b83e882
|
errorCode新增
|
4 years ago |
|
jianjun
|
0ac12510c8
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
f063738018
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
117c6c82c2
|
网格员巡查记录bug修复
|
4 years ago |
|
zxc
|
339d338b3e
|
errorCode新增
|
4 years ago |
|
yinzuomei
|
9ed9134c1a
|
Merge remote-tracking branch 'origin/dev_point_task' into develop
|
4 years ago |
|
yinzuomei
|
acd672effa
|
/resi/mine/mine/profile新增todayObtainedPoint返参
|
4 years ago |
zhaoqifeng
|
190bc83b33
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
4775db3f16
|
基层治理 响应率自治率统计修改
小组积分排行入参验证
|
4 years ago |
|
sunyuchao
|
2ff9b13c91
|
Merge branches 'dev' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
