wxz
|
bd87f46e47
|
版本升级
|
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
|
2011c75559
|
Merge branch 'dev' into dev_externalappauth
|
5 years ago |
|
wxz
|
3de10a1564
|
外部应用管理增加内部客户ing
|
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 |
|
wangchao
|
c83d5c7d0a
|
对外接口，查询机关、部门、网格下工作人员，范围从“不包括未激活和被禁用的”调整成“不包括被禁用的”
|
5 years ago |
yinzuomei
|
f563d2f41a
|
stats 58
|
5 years ago |
|
yinzuomei
|
aebec00e09
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
|
5 years ago |
|
yinzuomei
|
70fcf916d3
|
OPER_EXT_APP_SECRET_RESET_FAIL 8713
|
5 years ago |
|
yinzuomei
|
e117cfdc75
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
|
5 years ago |
|
yinzuomei
|
da10ffe6b6
|
难点堵点、党建能力、党员相关代码提交v2
|
5 years ago |
|
yinzuomei
|
d631b3e94a
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
8269770456
|
难点堵点、党建能力、党员相关代码提交
|
5 years ago |
jianjun
|
b9ece9bf47
|
添加日志
|
5 years ago |
|
zhaoqifeng
|
bf1870f388
|
人员调动对自己操作
|
5 years ago |
|
yinzuomei
|
c432b44ead
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
yinzuomei
|
a489745784
|
区直部门添加注解
|
5 years ago |
zxc
|
281b69b4f2
|
全区相关
|
5 years ago |
|
jianjun
|
b25dfe810e
|
Merge remote-tracking branch 'remotes/origin/dev_externalappauth' into dev_screen_data
# Conflicts:
# epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java
# epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java
# epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java
# epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java
|
5 years ago |
|
wxz
|
6f7dca1ecb
|
版本升级
|
5 years ago |
|
wxz
|
3c3a757fab
|
Merge branch 'dev_footbar' into dev_temp
|
5 years ago |
|
wxz
|
e508de86db
|
增加/修改footbar去掉图标路径必填校验
|
5 years ago |
|
zxc
|
8d0e923f77
|
getAgencyListByCustomerId方法数据源改回原来的 STATS
|
5 years ago |
zhangyongzhangyong
|
f7282c4f00
|
control代码恢复
|
5 years ago |
|
zhangyongzhangyong
|
6847c957e2
|
配置文件恢复
|
5 years ago |
|
zhangyongzhangyong
|
95d8c395cb
|
Merge branch 'dev_screen_data' of C:\Users\Administrator\Desktop\党群e事通后端 with conflicts.
|
5 years ago |
|
jianjun
|
e073922dc1
|
添加统一的应用启动检查类
|
5 years ago |
|
wxz
|
814a9fd3e6
|
增加docker restart选项
|
5 years ago |
|
jianjun
|
e65c6581ed
|
添加统一的应用启动检查类
|
5 years ago |
|
jianjun
|
9fbb8136e4
|
党员相关 如果只有一条记录则给50分；处理导入指标的正负相关及阈值
|
5 years ago |
|
wxz
|
fd3f34f359
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
wxz
|
4136814cab
|
版本升级
|
5 years ago |
|
yinzuomei
|
84de6cfe32
|
stats 57
|
5 years ago |
|
yinzuomei
|
0b88f1e19d
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp
|
5 years ago |
|
yinzuomei
|
1427c2cbbc
|
区直部门暂存v1
|
5 years ago |
|
zhaoqifeng
|
f7be4ec65b
|
third服务升级
|
5 years ago |
|
zhaoqifeng
|
c6fc59e147
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
cac92dc422
|
业务域名服务器域名设置
|
5 years ago |
|
zhaoqifeng
|
0f6a9bd7eb
|
third服务升级
|
5 years ago |
|
zxc
|
a203a8626d
|
街道相关优化 3
|
5 years ago |
|
zhaoqifeng
|
6e524f6ac5
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
34799c9c89
|
业务域名服务器域名设置
|
5 years ago |
|
zxc
|
1f27decf19
|
街道相关优化 2
|
5 years ago |
|
yinzuomei
|
6b2730e4aa
|
区直部门暂存
|
5 years ago |
