zhaoqifeng
|
0c0f18b533
|
我参与的议题-修改
|
5 years ago |
|
zhaoqifeng
|
4df79724ef
|
账号安全 获取手机号不返回null
|
5 years ago |
wxz
|
cc24b33fa1
|
修复：我创建的话题列表，网格id为空的空指针错误
|
5 years ago |
|
wxz
|
5e1eb99678
|
Merge branch 'dev_personal_center' into dev
|
5 years ago |
wangchao
|
03e2a65a3e
|
热心居民认证时，刷新该用户所在所有组缓存的热心居民数
|
5 years ago |
|
wangchao
|
5bfa0689ee
|
取消或点亮徽章时强一致性
|
5 years ago |
|
wangchao
|
ee74b9c0af
|
取消或点亮徽章时强一致性
|
5 years ago |
|
wangchao
|
1abe8d3419
|
queryGroupProcessingCount空指针问题
|
5 years ago |
|
wxz
|
cba96c4487
|
修复：【提交小组信息编辑】,修复只有党员身份无法编辑小组的问题
|
5 years ago |
|
wxz
|
b6d24aab05
|
修复：【我创建的话题(已转议题)】接口，没有查询到项目的情况下空指针异常
|
5 years ago |
|
zhaoqifeng
|
5a630f86b9
|
组织下有网格，不允许删除
|
5 years ago |
|
zhaoqifeng
|
2d97dbfd60
|
防止重复提交
|
5 years ago |
sunyuchao
|
b27295beee
|
Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
|
5 years ago |
|
sunyuchao
|
ea0bafb0ec
|
外挂接口添加返参
|
5 years ago |
|
sunyuchao
|
ab6eea084c
|
外挂接口添加返参
|
5 years ago |
|
zhaoqifeng
|
4013ccce9d
|
徽章审核驳回消息修改
|
5 years ago |
zxc
|
74ef1a6290
|
徽章修改
|
5 years ago |
|
zxc
|
abcaf53241
|
徽章修改
|
5 years ago |
|
sunyuchao
|
fbf702839c
|
程序修改
|
5 years ago |
|
zxc
|
2c54ebb84b
|
徽章修改
|
5 years ago |
liushaowen
|
3aa6dd178b
|
建议列表bug
|
5 years ago |
|
wangchao
|
791059f25b
|
客户下线但是用户点亮的徽章在查询数据库时不应该被查出
|
5 years ago |
|
sunyuchao
|
3dd7e73900
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
509c119286
|
对外接口添加权重返参
|
5 years ago |
yinzuomei
|
6518ca71ca
|
/data/report/screen/index/monthindexanalysis/barchart返参增加权重信息，四舍五入，保留小数点后两位
|
5 years ago |
|
yinzuomei
|
0c5895de6a
|
/data/report/screen/index/monthindexanalysis/barchart返参增加权重信息
|
5 years ago |
|
zxc
|
dc7d21534a
|
徽章修改
|
5 years ago |
|
zhaoqifeng
|
fb11357bc5
|
徽章最多上线5个
|
5 years ago |
|
zxc
|
1f5afb7bd2
|
徽章修改
|
5 years ago |
|
zhaoqifeng
|
27d6756a1b
|
徽章个数不超过5个
|
5 years ago |
|
liushaowen
|
bd55f7f308
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
liushaowen
|
1058ce65e5
|
运营端查询建议列表优化
|
5 years ago |
|
wxz
|
a9efa6e4d6
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
wxz
|
cd014fc47e
|
文案写错(已转项目写成已转议题)修改
|
5 years ago |
|
zxc
|
0c9515018d
|
徽章修改
|
5 years ago |
|
sunyuchao
|
cffbb48e23
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
sunyuchao
|
8a9d6e1909
|
旧接口程序完善
|
5 years ago |
|
zxc
|
de55c79642
|
徽章排序修改，提交审核添加校验
|
5 years ago |
|
zxc
|
4c9f872ecf
|
徽章修改
|
5 years ago |
|
wangchao
|
4e117ec2d0
|
居民端显示用户徽章，如果用户是点亮状态，但是客户的徽章被下线，缓存中不会出现此徽章，但是数据库中依然存在，且是点亮状态。
|
5 years ago |
|
zxc
|
0a40ab2088
|
徽章修改
|
5 years ago |
jianjun
|
757c10d568
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_personal_center
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.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/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/resources/logback-spring.xml
# epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
5 years ago |
|
zxc
|
2f034a045c
|
我发起的议题表决中 url修改
|
5 years ago |
|
wxz
|
d95d31f073
|
恢复x文件
|
5 years ago |
|
wxz
|
1a162a1623
|
删除x文件
|
5 years ago |
|
wxz
|
2c7e78572d
|
加个空格
|
5 years ago |
|
wxz
|
ee233c81e9
|
Merge branch 'dev_group_edit' into dev
# Conflicts:
# 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/utils/ModuleConstant.java
|
5 years ago |
|
zxc
|
01a42497c3
|
用户徽章缓存修改
|
5 years ago |
|
jianjun
|
5311a12228
|
日志添加参数
|
5 years ago |
|
sunyuchao
|
896c9fd3f3
|
Merge branch 'dev_wx_msg' into dev
|
5 years ago |
