liuchuang
|
9e3259f29b
|
Merge remote-tracking branch 'origin/feature/lc_understandjs' into feature/lc_partyGroup
# Conflicts:
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserGridRelationDao.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserGridRelationDao.xml
|
5 years ago |
songyunpeng
|
f44f4c5456
|
党群管理bug修改
|
5 years ago |
zhangyongzhangyong
|
90cfa89dfb
|
积分列表，积分相同，按照创建时间倒序
|
5 years ago |
|
zhangyongzhangyong
|
7d9c2e65bd
|
积分排行接口修改
|
5 years ago |
|
songyunpeng
|
f91e4a9eea
|
feign url去除
|
5 years ago |
|
songyunpeng
|
8a35c1425e
|
党群1+1接口
|
5 years ago |
|
zhangyongzhangyong
|
0918b9804e
|
消息通知修改操作
|
5 years ago |
|
zhangyongzhangyong
|
72034cb5ab
|
消息通知首页查询条件修改
|
5 years ago |
|
zhangyongzhangyong
|
c0680a6182
|
排序字段-数据类型更改
|
5 years ago |
|
liuchuang
|
1a2bb102d0
|
Merge remote-tracking branch 'origin/master' into feature/lc_partyGroup
|
5 years ago |
|
liuchuang
|
23a771208c
|
Merge remote-tracking branch 'origin/master' into feature/lc_understandjs
# Conflicts:
# esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml
|
5 years ago |
|
zhangyongzhangyong
|
02619de3a5
|
硬核页面修改
|
5 years ago |
|
zhangyongzhangyong
|
3629f3db19
|
消息通知、模块接口修改
|
5 years ago |
|
liuchuang
|
8cebd8979f
|
修改镜像仓库地址
|
5 years ago |
|
liuchuang
|
7e96374264
|
Merge remote-tracking branch 'origin/feature/lc_modifyNewVolunteer'
|
5 years ago |
|
songyunpeng
|
1753c53663
|
党群1+1接口
|
5 years ago |
|
zhangyongzhangyong
|
ec3ad5b1a3
|
banner列表 排序
|
5 years ago |
|
zhangyongzhangyong
|
abe70e3906
|
【打卡积分】-【查看页面】增加屏蔽功能，
打卡列表接口添加 限制条件
|
5 years ago |
|
liuchuang
|
8d80e57cc2
|
修改镜像仓库地址
|
5 years ago |
|
zhangyongzhangyong
|
990c3a14b6
|
活动列表sql恢复
|
5 years ago |
|
zhangyongzhangyong
|
bf1352f1c2
|
活动表，增加字段
|
5 years ago |
|
zhangyongzhangyong
|
1908fc5653
|
活动表增加字段
|
5 years ago |
|
songyunpeng
|
6f981a41fe
|
群成员搜索条件
|
5 years ago |
|
zhangyongzhangyong
|
9f0d8f2b6f
|
志愿者-活动列表接口修改
|
5 years ago |
|
zhangyongzhangyong
|
3af61de6ea
|
banner接口，增加：banner类型参数: 0-(活动/志愿者banner)， 2-志愿者证书
|
5 years ago |
|
zhangyongzhangyong
|
7c9212b002
|
1.志愿者 - banner管理，增加banner类型数据字典项。
2.增加接口默认网格查询。
|
5 years ago |
|
songyunpeng
|
771f7c92fb
|
gateway添加新模块
|
5 years ago |
|
songyunpeng
|
e73aeddaa1
|
党群管理
|
5 years ago |
|
zhangyongzhangyong
|
235092e851
|
消息通知，排序规则
|
5 years ago |
|
zhangyongzhangyong
|
9ce60a50cb
|
消息通知-通知管理，增加通知部门回显
|
5 years ago |
|
zhangyongzhangyong
|
026649f5bc
|
custom模块 去除url
|
5 years ago |
|
zhangyongzhangyong
|
c79a702fdd
|
议题处理，增加吹哨并转项目
|
5 years ago |
|
zhangyongzhangyong
|
481916dec2
|
通知列表(通) 增加富文本返回字段、查询条件增加
|
5 years ago |
|
zhangyongzhangyong
|
17d5a680c1
|
积分记录-锦水-积分排行接口
|
5 years ago |
|
songyunpeng
|
a80f1acf39
|
话题管理+网格长管理
|
5 years ago |
|
liuchuang
|
a72f76ff3b
|
修改生产环境数据库配置
|
6 years ago |
|
zhangyongzhangyong
|
c3a53735f0
|
新闻管理 修改 机构类型回显
|
6 years ago |
|
zhangyongzhangyong
|
8b805e7065
|
图片配置 增加图片编码选项
|
6 years ago |
|
songyunpeng
|
f54c78aa8f
|
获取配置图片接口修改
|
6 years ago |
|
zhangyongzhangyong
|
922b733b4d
|
custom 发布配置文件
|
6 years ago |
|
songyunpeng
|
3459c85ef5
|
党群模块代码提交
|
6 years ago |
|
zhangyongzhangyong
|
234121040e
|
custom test环境端口号更改
|
6 years ago |
|
zhangyongzhangyong
|
cc2b921bee
|
硬核接口增加权限控制
|
6 years ago |
|
zhangyongzhangyong
|
2085c71153
|
通知详情 增加返回字段：首图
|
6 years ago |
|
liuchuang
|
b507b9cec7
|
志友朵朵列表去掉数据权限
|
6 years ago |
|
zhangyongzhangyong
|
75fb29915f
|
了解锦水 硬核、模块接口开发
|
6 years ago |
|
zhangyongzhangyong
|
c6fd95cd7a
|
了解锦水 - 模块管理、硬核 页面开发
|
6 years ago |
|
zhangyongzhangyong
|
b84e1c56c5
|
通知列表 接口
|
6 years ago |
|
liuchuang
|
4d435b213d
|
Merge remote-tracking branch 'origin/master' into feature/lc_understandjs
|
6 years ago |
|
liuchuang
|
48ad571bb7
|
修改误提交的错误代码
|
6 years ago |
