wxz
|
1cc9df3978
|
1.将dev环境改为130机器
|
6 years ago |
|
wxz
|
a0ccb5d357
|
1.修复docker-compose-dev.yml中的image地址错误
|
6 years ago |
|
wxz
|
5a1bfd0a55
|
1.测试发布到130机器
|
6 years ago |
|
wxz
|
f81cbc4458
|
1.测试Dockerfile引用compose.yml环境变量
|
6 years ago |
|
wxz
|
ac30800de3
|
1.测试Dockerfile引用compose.yml环境变量
|
6 years ago |
|
wxz
|
6b9ec2a3f8
|
1.测试release版本升级
|
6 years ago |
|
wxz
|
488a9ba8cb
|
1.测试release版本升级
|
6 years ago |
|
wxz
|
9f62498504
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
6 years ago |
|
wxz
|
c95e213b52
|
1.新建模块epmet-commons-service-call，用于服务发现和服务调用相关的配置定义
2.gov-org-server,gov-mine-server引入epmet-commons-service-call模块，新增了loadBalanc配置demo，暂未启用
|
6 years ago |
yinzuomei
|
6b613d3cf6
|
政府端-基层治理-居民管理、群组管理、党员认证，组织机构所有接口添加操作权限
|
6 years ago |
|
yinzuomei
|
bc35d191d2
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
6 years ago |
|
yinzuomei
|
26ba178868
|
新增resi-hall8100,gov-issue8101,gov-project8102
|
6 years ago |
|
wxz
|
654bb25e31
|
1.将数据权限和操作权限分开，允许仅使用操作权限而不开启数据权限
2.将操作权限判断放入common-tools
|
6 years ago |
|
wxz
|
ee02c593be
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
|
6 years ago |
|
wxz
|
3edae4e9f0
|
增加清理sqlFilter ThreadLocal变量的AOP
|
6 years ago |
|
yinzuomei
|
0d2a0d92c3
|
govgrid,govorg,resimine，epmetuser内存增加到300M
|
6 years ago |
|
wxz
|
f695c412fc
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
|
6 years ago |
|
wxz
|
e917105566
|
权限基本完成
|
6 years ago |
|
yinzuomei
|
873757b544
|
bug修改
|
6 years ago |
|
yinzuomei
|
f7d39fdb00
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
6 years ago |
zhaoqifeng
|
240939d951
|
运营端小程序首页bug修改
|
6 years ago |
wangchao
|
c0ae84f82f
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
6 years ago |
|
wangchao
|
f4a0f74142
|
运营端验证码报错提示修改，运营端同一个账号做登录强踢
|
6 years ago |
|
yinzuomei
|
9d9f90d1bd
|
客户定制化居民端首页bug修改发布
|
6 years ago |
|
yinzuomei
|
63bfdc17cd
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
6 years ago |
|
zhaoqifeng
|
2461bfe89b
|
运营端小程序首页bug修改
|
6 years ago |
zxc
|
a81b519305
|
已认证党员详情，注册时间字段修改
|
6 years ago |
|
yinzuomei
|
bfd5ff7f20
|
带有指定职责的工作人员sql修改 发布服务
|
6 years ago |
|
yinzuomei
|
d8743b2a08
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
6 years ago |
|
wangchao
|
945493f1c3
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
6 years ago |
|
wangchao
|
3ba4bc2567
|
查询带有指定职责的工作人员sql修改
|
6 years ago |
|
yinzuomei
|
af4e9d50ce
|
修改工作单位/所处街道查询字段，发布
|
6 years ago |
|
yinzuomei
|
012a446b54
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
6 years ago |
|
zxc
|
2770595758
|
修改工作单位/所处街道查询字段
|
6 years ago |
|
yinzuomei
|
964516ce34
|
政府端组织详情接口sql调整发布
|
6 years ago |
sunyuchao
|
35e3f1116b
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
6 years ago |
|
sunyuchao
|
a798b395cd
|
政府端-组织详情接口sql调整
|
6 years ago |
|
yinzuomei
|
babeb74e55
|
partymember|group|user升级
|
6 years ago |
|
wangchao
|
edce18ac8e
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
6 years ago |
|
wangchao
|
a35755b43f
|
建组审核驳回消息模板，热心居民审核驳回消息模板
|
6 years ago |
zxc
|
ef96e088cf
|
时间戳修改为秒级
|
6 years ago |
|
wxz
|
257d837a0c
|
版本升级
|
6 years ago |
|
wxz
|
952ea2fcb3
|
解决RedisTemplate.opsForValue()存取List<Object>时候的类型转换异常，改为手动序列化，使用stringRedisTemplate
|
6 years ago |
|
yinzuomei
|
02174748cd
|
partymember|group升级
|
6 years ago |
|
yinzuomei
|
afb50f7303
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
6 years ago |
|
yinzuomei
|
90f2bf02d4
|
parymember时间戳改为秒级
|
6 years ago |
|
zxc
|
0049861d4e
|
gridFullPath修改
|
6 years ago |
|
yinzuomei
|
ae74f7e78b
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
6 years ago |
|
wangchao
|
f977009783
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
6 years ago |
|
wangchao
|
c9b8adf405
|
mysql函数日期格式调整
|
6 years ago |
