sunyuchao
|
c3ac60f481
|
生产bug修改
|
5 years ago |
wangchao
|
df9a5b3cb5
|
Merge remote-tracking branch 'origin/dev_group_edit' into dev_temp
|
5 years ago |
|
wangchao
|
22ab27999b
|
bug修改
|
5 years ago |
zhaoqifeng
|
8084fce2b4
|
工作端-徽章管理
|
5 years ago |
zxc
|
67baaefff0
|
徽章认证详情
|
5 years ago |
|
zxc
|
1c8eca02dd
|
提交徽章认证
|
5 years ago |
|
wangchao
|
f803d9f1ae
|
Merge remote-tracking branch 'origin/dev_group_edit' into dev_temp
|
5 years ago |
|
wangchao
|
dba6589ffa
|
组变更申请，主页红点的相关修改
|
5 years ago |
wxz
|
41f431cd36
|
Merge branch 'dev_group_edit' into dev_temp
|
5 years ago |
|
wxz
|
303317c5dc
|
Merge remote-tracking branch 'origin/dev_group_edit' into dev_group_edit
|
5 years ago |
|
wxz
|
361edcb801
|
1.调整小组信息编辑异常抛出
|
5 years ago |
|
wangchao
|
cb52b9dee3
|
Merge remote-tracking branch 'origin/dev_group_edit' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
5 years ago |
|
wangchao
|
1e96137a32
|
工作端 组变更
|
5 years ago |
|
wangchao
|
7a65650d40
|
Merge remote-tracking branch 'origin/dev_group_edit' into dev_group_edit
|
5 years ago |
|
wxz
|
6e814b72d3
|
Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
wxz
|
0ec0ec2686
|
Merge branch 'dev_group_edit' into dev_temp
|
5 years ago |
|
wxz
|
61dfe89161
|
1.组信息编辑提交，增加编辑次数判断
|
5 years ago |
|
zxc
|
54219febb4
|
徽章列表
|
5 years ago |
|
wxz
|
21cacb49a8
|
1.提交组信息编辑接口，增加名字和介绍的长度校验
|
5 years ago |
jianjun
|
4f599ac1bb
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_an_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
6b1d5b2759
|
调整report dao日志
|
5 years ago |
|
jianjun
|
24cc26deed
|
安宁 03、基层党员-党员排行榜单 采集和查询接口 添加 月份Id 字段
|
5 years ago |
|
jianjun
|
d8ec9422e4
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev
|
5 years ago |
|
jianjun
|
90cf9bf7c0
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev_difficulty_data
|
5 years ago |
|
jianjun
|
663a11edb0
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data
|
5 years ago |
|
jianjun
|
ee28c1e309
|
Merge branch 'dev' into dev_personal_center
|
5 years ago |
|
sunyuchao
|
9e88e922b7
|
对外接口-文件上传
|
5 years ago |
|
wangchao
|
ab76e69e5b
|
Merge remote-tracking branch 'origin/dev_group_edit' into dev_group_edit
|
5 years ago |
|
wxz
|
4359cf8fd2
|
Merge branch 'dev_group_edit' into dev_temp
|
5 years ago |
|
wxz
|
4b01b540dd
|
1.小组信息编辑增加flyway脚本
2.增加小组变更审核列表权限字典
|
5 years ago |
|
wxz
|
2c05206032
|
Merge branch 'dev_group_edit' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
|
5 years ago |
|
wxz
|
f7044af28b
|
创建小组申请，增加阿里云内容检查
|
5 years ago |
|
wxz
|
84fae44a1e
|
创建小组申请，增加阿里云内容检查
|
5 years ago |
|
zxc
|
c5dadab50b
|
徽章列表
|
5 years ago |
|
zxc
|
6e23580f06
|
徽章列表
|
5 years ago |
|
wxz
|
fe40830198
|
Merge branch 'dev_group_edit' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
|
5 years ago |
|
wxz
|
7a6e482639
|
修改：组信息编辑提交接口，增加网格内名称存在校验
|
5 years ago |
|
jianjun
|
0304c5fd6c
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
|
5 years ago |
|
wangchao
|
3c11387e6c
|
Merge remote-tracking branch 'origin/dev_group_edit' into dev_group_edit
# Conflicts:
# 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
|
5 years ago |
|
jianjun
|
8c0bd79d72
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
5a4245346f
|
部署report，statis
|
5 years ago |
|
zhaoqifeng
|
854e23d32c
|
个人中心-信息修改
|
5 years ago |
|
wxz
|
14c662ccc1
|
完成组信息编辑提交接口
|
5 years ago |
|
jianjun
|
c61ce8c7d6
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data
|
5 years ago |
|
zxc
|
d4037cae2e
|
徽章controller，service
|
5 years ago |
|
sunyuchao
|
800cc1ffe0
|
对外接口-查询组织基本信息
|
5 years ago |
|
wxz
|
5b6d4780c2
|
Merge branch 'dev_group_edit' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_group_edit
|
5 years ago |
|
wxz
|
595c9ca11d
|
临时提交：组信息编辑内容提交
|
5 years ago |
|
wangchao
|
4b78da437d
|
工作端 组变更列表查询
|
5 years ago |
|
jianjun
|
26b49ee5bd
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
|
5 years ago |
