yinzuomei
|
29f6b0e24e
|
修改partyuserrankdata
|
5 years ago |
|
yinzuomei
|
a1178dfd51
|
修改screen_user_join表，
|
5 years ago |
|
yinzuomei
|
954490e82c
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
# Conflicts:
# epmet-module/data-report/data-report-server/pom.xml
|
5 years ago |
|
yinzuomei
|
38fdaefefb
|
修改screen_party_branch_data表，新增averageJoinUserCount，修改meetCategoryId（issueCategoryId）,meetCategoryName(issueCategoryName)
|
5 years ago |
zxc
|
c900ba7912
|
党支部、用户分布
|
5 years ago |
|
zxc
|
1b9a2c19bc
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
zhangyongzhangyong
|
9a7248c4fa
|
大屏数据采集 全部接口
|
5 years ago |
|
zxc
|
cc9bf028fe
|
Merge branches 'dev_externalappauth' and 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
Conflicts:
epmet-module/data-report/data-report-server/pom.xml
|
5 years ago |
|
yinzuomei
|
e46fd65e75
|
Merge branches 'dev_externalappauth' and 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
Conflicts:
epmet-module/data-report/data-report-server/pom.xml
|
5 years ago |
jianjun
|
098605dae6
|
测试
|
5 years ago |
|
jianjun
|
3633df39b4
|
升级ext
|
5 years ago |
wxz
|
f700d97cc2
|
Merge branch 'dev_externalappauth' into dev_temp
# Conflicts:
# epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-common-service/common-service-server/pom.xml
|
5 years ago |
|
wxz
|
4376693053
|
版本升级
|
5 years ago |
|
wxz
|
0f47a87aef
|
修改错误的提交-FeignClient#url
|
5 years ago |
|
wxz
|
9b80e654e9
|
测试提交
|
5 years ago |
|
wxz
|
5e33e983d9
|
Merge branch 'dev_externalappauth' into dev_temp
# Conflicts:
# epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
# epmet-user/epmet-user-server/pom.xml
|
5 years ago |
|
wxz
|
43e7e3f406
|
版本升级
|
5 years ago |
|
wxz
|
792f6a1e34
|
Merge branches 'dev_temp' and 'release_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
5 years ago |
|
wxz
|
b905d4765e
|
增加外部应用请求鉴权模块
|
5 years ago |
zhaoqifeng
|
285c12d83d
|
小程序各种设置
|
5 years ago |
|
zxc
|
c5d22cb697
|
组织区域查询
|
5 years ago |
|
wxz
|
51c6e136f5
|
增加动态数据源配置
|
5 years ago |
|
zxc
|
3fd59b932e
|
组织机构树，组织区域查询
|
5 years ago |
wangchao
|
f480de9688
|
controller重命名 启动类修改位置
|
5 years ago |
|
wangchao
|
ff27e84bc1
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
wangchao
|
347a16d7bb
|
controller重命名
|
5 years ago |
|
jianjun
|
6eb5008048
|
dataport添加包
|
5 years ago |
|
zxc
|
5f16fa4d16
|
组织机构树，组织区域查询
|
5 years ago |
|
wangchao
|
0bb82217b4
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
wangchao
|
e9dff01a4e
|
党员基本信息
|
5 years ago |
sunyuchao
|
082250cb7d
|
接口返参调整
|
5 years ago |
|
sunyuchao
|
7c1453e1a4
|
Merge branch 'dev_plugins' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_plugins
|
5 years ago |
|
yinzuomei
|
de50cf447d
|
新增screen_customer_dept、screen_customer_grid
|
5 years ago |
|
wangchao
|
5769962dac
|
Merge remote-tracking branch 'origin/dev_plugins' into dev_plugins
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java
|
5 years ago |
|
wangchao
|
183e22182b
|
对外接口 工作人员的数据权限，既所在组织以及下级
ResiTopicOperationFormDTO去掉不必要的@NotBlank
|
5 years ago |
|
yinzuomei
|
e20e1d3672
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
a7d58b956d
|
修改screen_customer_agency表注释
|
5 years ago |
|
zxc
|
02b1a3dd5a
|
党支部、用户分布、党员分布
|
5 years ago |
|
sunyuchao
|
25e7f6ff77
|
Merge branch 'dev_plugins' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_plugins
Conflicts:
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
epmet-module/epmet-third/epmet-third-server/pom.xml
epmet-module/resi-group/resi-group-server/pom.xml
epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
epmet-user/epmet-user-server/pom.xml
|
5 years ago |
|
jianjun
|
1640091d09
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_screen_data
|
5 years ago |
|
jianjun
|
ec2e1c7cd0
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_plugins
# Conflicts:
# epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-third/epmet-third-server/pom.xml
# epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
# epmet-module/resi-group/resi-group-server/pom.xml
# epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
# epmet-user/epmet-user-server/pom.xml
|
5 years ago |
|
jianjun
|
6bbca75f39
|
部署user，group
|
5 years ago |
|
jianjun
|
7039ba00fc
|
Merge remote-tracking branch 'remotes/origin/release'
|
5 years ago |
|
zhaoqifeng
|
bbf5b9188e
|
版本升级
|
5 years ago |
|
zhaoqifeng
|
1138f961d3
|
Merge branch 'dev_plugins' into dev_temp
# Conflicts:
# epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-third/epmet-third-server/pom.xml
|
5 years ago |
|
yinzuomei
|
504b2810d5
|
数据采集+大屏查询接口代码初始化
|
5 years ago |
|
zhaoqifeng
|
d9cb1ba8d0
|
关闭话题添加已解决未解决
|
5 years ago |
|
sunyuchao
|
069e0fda29
|
Merge branches 'dev' and 'dev_plugins' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_plugins
Conflicts:
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
epmet-module/epmet-third/epmet-third-server/pom.xml
epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
epmet-module/resi-group/resi-group-server/pom.xml
epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
epmet-user/epmet-user-server/pom.xml
|
5 years ago |
|
wangchao
|
2cccd03131
|
user 升级 同步130 版本号到 118 [test.yml]
group升级 同步130 版本号到 66 [test.yml]
|
5 years ago |
|
wangchao
|
08ed155bf9
|
Merge remote-tracking branch 'origin/dev' into release
|
5 years ago |
