yinzuomei
|
77dee4155d
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPioneerDataEntity.java
|
5 years ago |
|
yinzuomei
|
0d7d292f66
|
screen_相关表修改
|
5 years ago |
zhaoqifeng
|
a3f408cb40
|
oper-customize升级
|
5 years ago |
|
zhaoqifeng
|
6e0b137efb
|
Merge branch 'dev_plugins' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
f9a85d2a9a
|
设置业务域名修改
|
5 years ago |
|
zhaoqifeng
|
2596b5eef4
|
设置服务器域名修改
|
5 years ago |
zxc
|
c22f2a76c8
|
getXPro
|
5 years ago |
|
zxc
|
453df054ec
|
获取月份时间轴优化
|
5 years ago |
sunyuchao
|
aa0a2a5cba
|
服务升级
|
5 years ago |
|
sunyuchao
|
daed29d066
|
Merge branch 'dev_plugins' into dev_temp
|
5 years ago |
|
sunyuchao
|
671903ccfb
|
定制功能详情添加是否有客户使用字段、采集不展示下架的客户没有的数据、数据库字段调整大小
|
5 years ago |
wxz
|
803bcbb7f0
|
版本升级
|
5 years ago |
|
wxz
|
b696e20cc9
|
Merge branch 'dev_externalappauth' into dev_temp
|
5 years ago |
|
zxc
|
28a9535125
|
先锋模范优化
|
5 years ago |
|
wxz
|
a013f2bfbd
|
打开dev的nacos注册
|
5 years ago |
|
sunyuchao
|
be5ce96cce
|
服务升级
|
5 years ago |
|
sunyuchao
|
06ba51503d
|
Merge branch 'dev_plugins' into dev_temp
|
5 years ago |
|
wxz
|
3e8e37101a
|
版本升级
|
5 years ago |
|
wxz
|
f0ee2fd516
|
Merge branch 'dev_externalappauth' into dev_temp
|
5 years ago |
|
wxz
|
320a9dbc4c
|
完成应用维护
|
5 years ago |
zhangyongzhangyong
|
321b9d7409
|
定制功能修改 接口
|
5 years ago |
|
wxz
|
00d0973829
|
完成外部客户维护
|
5 years ago |
|
zxc
|
ae17f56fe4
|
1、先锋模范
|
5 years ago |
|
sunyuchao
|
520ca4608f
|
服务升级
|
5 years ago |
|
sunyuchao
|
1b7eaa402e
|
Merge branch 'dev_plugins' into dev_temp
|
5 years ago |
|
sunyuchao
|
a797305d87
|
定制功能采集时绑定客户与功能关系
|
5 years ago |
|
wxz
|
5c06fa9a41
|
版本升级
|
5 years ago |
|
wxz
|
b84d4f6811
|
版本升级
|
5 years ago |
|
wxz
|
060f3845ca
|
Merge remote-tracking branch 'origin/dev' into release
|
5 years ago |
|
zhangyongzhangyong
|
57d76e6486
|
10、党建引领-先锋模范数据 接口修改
|
5 years ago |
wangchao
|
35173e0d03
|
ext +1
|
5 years ago |
|
zhangyongzhangyong
|
d2c2a85705
|
指数采集接口修改-end
|
5 years ago |
|
wangchao
|
16dabc074f
|
user +1 govorg +1
|
5 years ago |
|
wangchao
|
64ee11e813
|
Merge branches 'dev_plugins' and 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_plugins
|
5 years ago |
|
wangchao
|
0b86a72109
|
修改staff/permission接口的bug
|
5 years ago |
|
wangchao
|
dc5cf0ce2f
|
修改feignClient中的url
|
5 years ago |
|
wangchao
|
dd2c58fba5
|
基层治理接口 1~4
|
5 years ago |
|
zhaoqifeng
|
4a137da223
|
客户基本信息修改只改客户名和logo
|
5 years ago |
|
zxc
|
c6daa8fff3
|
3、党员志愿服务
|
5 years ago |
|
zxc
|
93af81cee3
|
2、党员联系群众
|
5 years ago |
|
zxc
|
ed1c7caacf
|
2、党员联系群众
|
5 years ago |
|
zhangyongzhangyong
|
57909e4ba3
|
指数采集 接口开发
|
5 years ago |
|
zhaoqifeng
|
40bc65adb4
|
设置业务域名
|
5 years ago |
|
zhaoqifeng
|
04e776b661
|
third升级
|
5 years ago |
|
zhaoqifeng
|
93283f939e
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
3b66c01c42
|
设置业务域名和服务器域名
|
5 years ago |
|
yinzuomei
|
93ebd5e347
|
Merge branch 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release
Conflicts:
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
|
5 years ago |
|
sunyuchao
|
f5e0fea384
|
客户定制功能列表bug修改 服务升级
|
5 years ago |
|
sunyuchao
|
8931335e39
|
Merge branch 'dev_plugins' into dev_temp
|
5 years ago |
|
sunyuchao
|
f2b6092458
|
客户定制功能列表bug修改
|
5 years ago |
