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 |
wxz
|
4376693053
|
版本升级
|
5 years ago |
wxz
|
0f47a87aef
|
修改错误的提交-FeignClient#url
|
5 years ago |
wxz
|
b905d4765e
|
增加外部应用请求鉴权模块
|
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 |
yinzuomei
|
de50cf447d
|
新增screen_customer_dept、screen_customer_grid
|
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 |
jianjun
|
1640091d09
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_screen_data
|
5 years ago |
jianjun
|
6bbca75f39
|
部署user,group
|
5 years ago |
jianjun
|
7039ba00fc
|
Merge remote-tracking branch 'remotes/origin/release'
|
5 years ago |
yinzuomei
|
504b2810d5
|
数据采集+大屏查询接口代码初始化
|
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 |
wangchao
|
4f9d8639c4
|
user +1 118
|
5 years ago |
wangchao
|
7a31fc276c
|
查找用户的身份信息 修改
|
5 years ago |
wangchao
|
40669bca49
|
resi-group 版本号+1
|
5 years ago |
wxz
|
032463eabe
|
集群外部服务请求认证注解和拦截器雏形
|
5 years ago |
wangchao
|
dcf8e83e75
|
user +1 -> 117
|
5 years ago |
wangchao
|
0fd867815f
|
enterGrid时,不去校验客户Id,多客户版本(党群e事通),一个用户在多个客户下只能注册一次居民,单客户版本(不同appId),同样的微信账户在不同的小程序下使用的是不同的帐号,因此也不必校验customerId
|
5 years ago |
jianjun
|
9c343e42bc
|
部署gateWay
|
5 years ago |
wangchao
|
43abf70599
|
resi-group 服务更新
|
5 years ago |
jianjun
|
d8b1e9ebf1
|
Merge remote-tracking branch 'remotes/origin/release_temp'
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
|
5 years ago |
jianjun
|
6aea81a5fc
|
Merge remote-tracking branch 'remotes/origin/dev_temp' into release_temp
|
5 years ago |
jianjun
|
ff8f1eef5d
|
升级heart
|
5 years ago |
jianjun
|
f4c14fd885
|
Merge remote-tracking branch 'remotes/origin/release_temp'
|
5 years ago |
jianjun
|
71fd9dcb7e
|
Merge remote-tracking branch 'remotes/origin/dev_temp' into release_temp
|
5 years ago |
jianjun
|
5117d84218
|
修改亿联云 正式消息网关地址
|
5 years ago |
sunyuchao
|
aea782cdd8
|
生成服务升级
|
5 years ago |
jianjun
|
7c11ab342a
|
升级user,gateway,auth
|
5 years ago |
jianjun
|
d0be0542ea
|
升级third
|
5 years ago |
jianjun
|
89811dcc3c
|
部署third
|
5 years ago |
jianjun
|
53635864a7
|
部署third
|
5 years ago |