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 |
|
jianjun
|
654039601f
|
徽章初始化脚本
|
5 years ago |
|
wangchao
|
4e1e7ef569
|
小组变更表Entity属性相关修改，工作端审核变更接口返参入参DTO
|
5 years ago |
|
wxz
|
02338382fe
|
临时提交：居民端查询小组详情接口
|
5 years ago |
liushaowen
|
9547cad3fd
|
外部调用站内信整合
|
5 years ago |
|
sunyuchao
|
cf93abf325
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
sunyuchao
|
fcf7063af2
|
sql脚本版本调整
|
5 years ago |
|
wxz
|
c3bd497863
|
提交 自动生成的文件
|
5 years ago |
|
wxz
|
7b7f5f2ad4
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
wxz
|
eed9b33d76
|
sql字段错误修复
|
5 years ago |
|
liushaowen
|
68495228a0
|
Merge branch 'dev_wx_msg' of http://121.42.41.42:7070/r/epmet-cloud into dev_wx_msg
|
5 years ago |
|
liushaowen
|
748a5484de
|
消息-推送微信消息
|
5 years ago |
|
sunyuchao
|
f1beb51f1d
|
Merge branch 'master' into dev
|
5 years ago |
|
sunyuchao
|
8004c9416d
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
wxz
|
97d4e313ef
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
wxz
|
345f6af6f1
|
消息dto补加wxOpenId字段
|
5 years ago |
|
sunyuchao
|
0336b72d75
|
对外接口-获取站内信模板列表
|
5 years ago |
|
wxz
|
dc4e0aefe3
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
wxz
|
ba28386d11
|
wxmp_template_msg_subnscribe_status表相关对象增加open_id的属性
|
5 years ago |
|
sunyuchao
|
82c11e230f
|
查询模板Id sql调整
|
5 years ago |
|
zhaoqifeng
|
fe1977419d
|
订阅相同模板时添加关键字限制
|
5 years ago |
|
zxc
|
bd7fec4458
|
备注
|
5 years ago |
|
zxc
|
7b1b7925c3
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
34d98e7354
|
治理能力-部门相关指标添加验证、分批插入
|
5 years ago |
|
wxz
|
852b7f7c14
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
wxz
|
7cba19d507
|
修复：sql语法错误
|
5 years ago |
|
wxz
|
bcddc6a79e
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
wxz
|
da3774067a
|
修复：参数名称写错的bug
|
5 years ago |
|
wxz
|
c02947ad52
|
保存微信订阅状态，增加事务
|
5 years ago |
|
wxz
|
d3c2f9ab32
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
wxz
|
167b6fd251
|
修复：取消订阅次数不-1
|
5 years ago |
