wxz
|
25b10d75c4
|
Merge branch 'release'
|
5 years ago |
|
wxz
|
79d491bf29
|
Merge branch 'dev' into release
|
5 years ago |
|
wxz
|
fd3f34f359
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
wxz
|
4136814cab
|
版本升级
|
5 years ago |
zhaoqifeng
|
a3b2dfdd32
|
third服务升级
|
5 years ago |
|
zhaoqifeng
|
b683eacc87
|
Merge branch 'release'
# Conflicts:
# epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
|
5 years ago |
|
zhaoqifeng
|
4a0beb7030
|
Merge branch 'dev' into release
|
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
|
5d14c31e96
|
Merge branch 'dev' into release
|
5 years ago |
|
zhaoqifeng
|
0f6a9bd7eb
|
third服务升级
|
5 years ago |
|
zhaoqifeng
|
6e524f6ac5
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
34799c9c89
|
业务域名服务器域名设置
|
5 years ago |
|
wxz
|
d9bf4e6f9c
|
Merge branch 'release'
# Conflicts:
# epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
# epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
|
5 years ago |
|
wxz
|
1c9c3c9a99
|
Merge branch 'dev' into release
|
5 years ago |
|
wxz
|
65f4fc7c14
|
版本升级
|
5 years ago |
sunyuchao
|
d3dc641866
|
Merge branch 'release'
|
5 years ago |
|
sunyuchao
|
314176cf81
|
Merge branch 'dev' into release
|
5 years ago |
|
sunyuchao
|
2119a0847a
|
Merge branch 'dev_staff_transfer' into dev
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
|
5 years ago |
|
sunyuchao
|
bfe24cc228
|
Merge branch 'dev_plugins' into dev
# Conflicts:
# epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtTokenUtils.java
|
5 years ago |
|
wxz
|
4a6f8bbfd7
|
Merge branch 'dev_externalappauth' into dev
|
5 years ago |
|
wxz
|
d65cc6cea2
|
新增：外部应用秘钥重置
|
5 years ago |
|
wxz
|
0b6ee2a2ee
|
新增：md5摘要验签方式的外部应用认证
|
5 years ago |
zhangyongzhangyong
|
352c936f4f
|
1、定制功能修改-支持修改功能说明。2.列表查询sql修改
|
5 years ago |
|
zhangyongzhangyong
|
a0dcbd07b6
|
定制功能上架 - 代码优化
|
5 years ago |
|
sunyuchao
|
1462b7a608
|
代码修改
|
5 years ago |
|
zhangyongzhangyong
|
dc44aab8fb
|
客户定制功能上架，不能超过12个
|
5 years ago |
|
sunyuchao
|
159c107037
|
采集功能添加默认12个功能数限制
|
5 years ago |
|
sunyuchao
|
7f7e904c56
|
居民完善信息、党员认证 手机号验证码校验改为非必须
|
5 years ago |
|
sunyuchao
|
b50af78847
|
第三方获取微信用户手机号接口
|
5 years ago |
|
wxz
|
c1ea0143db
|
版本升级
|
5 years ago |
|
wxz
|
080b6686d8
|
Merge branch 'release'
|
5 years ago |
|
wxz
|
c281799669
|
Merge branch 'dev' into release
|
5 years ago |
|
wxz
|
aa2dc4a172
|
版本升级
|
5 years ago |
|
wxz
|
9d507ee033
|
版本升级
|
5 years ago |
|
wxz
|
0f4e9a43ad
|
Merge branch 'release'
|
5 years ago |
|
wxz
|
57556b368a
|
Merge branch 'dev' into release
|
5 years ago |
|
wxz
|
c74b35701e
|
版本升级
|
5 years ago |
|
sunyuchao
|
f930f4139e
|
Merge branch 'dev' into release
|
5 years ago |
|
sunyuchao
|
fb4c119807
|
放开wxlogin接口获取sessionkey
|
5 years ago |
|
zhaoqifeng
|
9bbf3c7853
|
工作人员调动
|
5 years ago |
|
wxz
|
7741c4ef21
|
新增工作人员调动的权限枚举
|
5 years ago |
|
zhangyongzhangyong
|
66bac5d209
|
定制功能列表接口，功能名称支持模糊查询
|
5 years ago |
|
zhaoqifeng
|
c19aa75b8c
|
工作人员调动
|
5 years ago |
|
sunyuchao
|
c51ec0512b
|
Merge remote-tracking branch 'origin/dev_staff_transfer' into dev_staff_transfer
|
5 years ago |
|
sunyuchao
|
1fcdaf2b13
|
屏蔽居民信息提交接口对手机号验证码的校验
|
5 years ago |
|
sunyuchao
|
857f6b036d
|
Merge branch 'dev_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
62649fb07d
|
代码还原 不在这个分支上修改
|
5 years ago |
|
sunyuchao
|
f79cfd7fd5
|
禅道bug修改
|
5 years ago |
