yinzuomei
|
188cc42b2c
|
安宁e家新增数据端应用
|
5 years ago |
jianjun
|
0a0804107d
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix
|
5 years ago |
|
jianjun
|
28d19854d0
|
Merge remote-tracking branch 'remotes/origin/master' into master_bugfix
|
5 years ago |
|
jianjun
|
79691f6f44
|
部署reposrt
|
5 years ago |
|
jianjun
|
ea364e3675
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
dbfb8c1251
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
|
5 years ago |
|
jianjun
|
ed542f696f
|
修改错误
|
5 years ago |
|
jianjun
|
7d1af6c758
|
部署statis report user ext
|
5 years ago |
|
jianjun
|
50d5896ced
|
Merge remote-tracking branch 'remotes/origin/dev'
|
5 years ago |
|
jianjun
|
9127e2163b
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev
# Conflicts:
# epmet-gateway/pom.xml
# epmet-module/epmet-ext/epmet-ext-server/pom.xml
# epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
# epmet-module/epmet-third/epmet-third-server/pom.xml
# epmet-module/gov-access/gov-access-server/pom.xml
# epmet-module/oper-customize/oper-customize-server/pom.xml
# epmet-user/epmet-user-server/pom.xml
|
5 years ago |
|
yinzuomei
|
68595ca048
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
7d0166487e
|
test
|
5 years ago |
zhaoqifeng
|
5834534969
|
体验版gov-org升级
|
5 years ago |
zxc
|
3635f20262
|
指标汇总计算
|
5 years ago |
sunyuchao
|
63b360976a
|
客户定制功能角色设置 服务升级
|
5 years ago |
|
sunyuchao
|
27f0cd9132
|
Merge branch 'dev_customize' into dev_temp
# Conflicts:
# epmet-module/resi-mine/resi-mine-server/pom.xml
|
5 years ago |
wxz
|
bd87f46e47
|
版本升级
|
5 years ago |
|
sunyuchao
|
a7d133004f
|
客户定制功能角色设置、查询；居民端、工作端角色列表查询
|
5 years ago |
|
wxz
|
66b2395045
|
版本升级
|
5 years ago |
|
wxz
|
42199ad85c
|
Merge branch 'dev_externalappauth' into dev_temp
# Conflicts:
# epmet-auth/pom.xml
# epmet-gateway/pom.xml
# epmet-module/epmet-common-service/common-service-server/pom.xml
# epmet-module/epmet-ext/epmet-ext-server/pom.xml
# epmet-module/epmet-heart/epmet-heart-server/pom.xml
# epmet-module/gov-access/gov-access-server/pom.xml
# epmet-module/gov-mine/gov-mine-server/pom.xml
# epmet-module/gov-org/gov-org-server/pom.xml
# epmet-module/oper-access/oper-access-server/pom.xml
# epmet-module/oper-crm/oper-crm-server/pom.xml
# epmet-module/oper-customize/oper-customize-server/pom.xml
# epmet-module/resi-partymember/resi-partymember-server/pom.xml
# epmet-user/epmet-user-server/pom.xml
|
5 years ago |
|
zhaoqifeng
|
c51ba3d876
|
gov-org升级
|
5 years ago |
|
zhaoqifeng
|
d0d8c4e4b7
|
Merge branch 'dev_staff_transfer' into dev_temp
|
5 years ago |
|
wxz
|
3f12b3ef2c
|
版本升级
|
5 years ago |
|
wxz
|
bc73413f51
|
完成外部应用-内部客户管理
|
5 years ago |
|
wxz
|
3b07723a55
|
Merge branch 'dev'
|
5 years ago |
|
wxz
|
fee3523582
|
版本升级
|
5 years ago |
|
yinzuomei
|
ea046f3dd1
|
组织内党员的参与议事能力考评分（平均值）index_code修改
|
5 years ago |
|
yinzuomei
|
a3022879d3
|
区直selectExtremeValue sql修改v2
|
5 years ago |
|
yinzuomei
|
170f7bf2ba
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
de648c295f
|
区直selectExtremeValue sql修改
|
5 years ago |
zhangyongzhangyong
|
0a9196025a
|
类型修改
|
5 years ago |
|
wxz
|
2011c75559
|
Merge branch 'dev' into dev_externalappauth
|
5 years ago |
wangchao
|
69da1bedee
|
Merge remote-tracking branch 'origin/release'
|
5 years ago |
|
wangchao
|
11a4d6b345
|
Merge remote-tracking branch 'origin/dev' into release
|
5 years ago |
|
wangchao
|
37e731a9f6
|
user ext dev服务升级
|
5 years ago |
|
wangchao
|
03d414f733
|
Merge remote-tracking branch 'origin/dev_plugins' into dev
|
5 years ago |
|
zhangyongzhangyong
|
9794b400ec
|
代码优化
|
5 years ago |
|
sunyuchao
|
531a920e20
|
客户定制功能角色设置代码生成
|
5 years ago |
|
wxz
|
3de10a1564
|
外部应用管理增加内部客户ing
|
5 years ago |
|
jianjun
|
eabe563d14
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
jianjun
|
06f4449d9c
|
删除无用方法
|
5 years ago |
|
zxc
|
b0a26d211c
|
社区、街道、全区修改
|
5 years ago |
|
jianjun
|
1ab0e0c32c
|
添加明细 相关性字段
|
5 years ago |
|
jianjun
|
a5eb4ea7bf
|
添加明细 相关性字段
|
5 years ago |
|
wangchao
|
3762e6b24b
|
针对外挂功能查询工作人员范围的调整
ext +1
user +1
|
5 years ago |
|
wangchao
|
f6a1c1f288
|
Merge remote-tracking branch 'origin/dev_plugins' into dev_temp
|
5 years ago |
|
zhangyongzhangyong
|
6ad06926ef
|
年表-月表，访问数据库次数优化
|
5 years ago |
|
wangchao
|
c83d5c7d0a
|
对外接口，查询机关、部门、网格下工作人员，范围从“不包括未激活和被禁用的”调整成“不包括被禁用的”
|
5 years ago |
|
zxc
|
350333606c
|
全区相关
|
5 years ago |
|
zhangyongzhangyong
|
bcfb1adb92
|
年表、月表 -- 展示接口优化
|
5 years ago |
