sunyuchao
|
2409d74954
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
sunyuchao
|
08a0433b04
|
外挂接口走安全校验
|
5 years ago |
|
sunyuchao
|
c0046df4a5
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
sunyuchao
|
a20d1406aa
|
bug修改
|
5 years ago |
|
sunyuchao
|
c585a25285
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
sunyuchao
|
a836c4fe80
|
方法调整
|
5 years ago |
|
sunyuchao
|
d545b01d2e
|
程序优化
|
5 years ago |
|
sunyuchao
|
711da11747
|
程序优化
|
5 years ago |
|
sunyuchao
|
16c6c23caa
|
外挂接口-查询组织部门网格树、查询组织或网格对应组织信息
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
wxz
|
14c662ccc1
|
完成组信息编辑提交接口
|
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 |
|
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 |
