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 |
wxz
|
157443077b
|
Merge branch 'wxz_trace_id' into dev
|
4 years ago |
|
wxz
|
8b5f2d14a5
|
添加TraceID(Transaction-Serial)的时候，如果nginx已经生成了该header，则直接用nginx的
|
4 years ago |
|
sunyuchao
|
6ab7c7f7c1
|
代码优化 bug修改
|
4 years ago |
|
jianjun
|
cc54c087dd
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
640710220b
|
注释添加
|
4 years ago |
|
wxz
|
da82b84921
|
Merge branch 'wxz_fix_mq_reg' into develop
|
4 years ago |
|
wxz
|
bd83017dc8
|
修改mq listener注册方式，弃用注解注册
|
4 years ago |
|
zxc
|
88eb05c07b
|
孔村、锦水、榆山的 orgType 微调
|
4 years ago |
|
zxc
|
dbc1efd516
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
af784664cb
|
左链接添加限制条件
|
4 years ago |
|
wxz
|
673bb4d1b7
|
修改：系统日志列表增加权限控制注解
|
4 years ago |
|
wxz
|
91445019b9
|
Merge branch 'dev_log' into dev
|
4 years ago |
|
zxc
|
c37fdcb411
|
。
|
4 years ago |
|
zxc
|
d92d6c8c7f
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
2bea7290b1
|
重复修改
|
4 years ago |
|
jianjun
|
c0b1c5fb16
|
Merge remote-tracking branch 'remotes/origin/dev_grid_patrol' into dev
|
4 years ago |
|
zxc
|
bb0f1dcb86
|
gridId改为非必填
|
4 years ago |
|
zhaoqifeng
|
8d7405e3f5
|
Merge branch 'dev_grid_patrol' into develop
|
4 years ago |
|
zxc
|
c4fdf63bb5
|
Merge remote-tracking branch 'origin/dev_grid_patrol' into develop
|
4 years ago |
|
jianjun
|
fb028efebb
|
roles
|
4 years ago |
|
zxc
|
1602546758
|
roles修改格式
|
4 years ago |
|
zhaoqifeng
|
efcbbdd864
|
Merge branch 'dev_grid_patrol' into develop
|
4 years ago |
|
zhaoqifeng
|
8fc8f6aabd
|
screen_project_data ALL_PARENT_IDS修改
|
4 years ago |
|
zxc
|
a442359946
|
Merge remote-tracking branch 'origin/dev_grid_patrol' into develop
|
4 years ago |
|
zxc
|
064d818b0a
|
工作人员角色补全
|
4 years ago |
|
jianjun
|
8ba4a5b02e
|
Merge remote-tracking branch 'remotes/origin/dev_grid_patrol' into develop
|
4 years ago |
|
jianjun
|
101dc28848
|
中央区项目数据设置orgType
|
4 years ago |
|
zhaoqifeng
|
21c97a3c15
|
Merge branch 'dev_grid_patrol' into develop
|
4 years ago |
|
zhaoqifeng
|
38bb4c0488
|
screen_project_data添加上报人ID
|
4 years ago |
|
jianjun
|
742f0763b5
|
Merge remote-tracking branch 'remotes/origin/dev_grid_patrol' into develop
|
4 years ago |
|
jianjun
|
bcf337a086
|
Merge remote-tracking branch 'origin/dev_grid_patrol' into dev_grid_patrol
|
4 years ago |
