zxc
|
cf4c1d02e7
|
login接口
|
5 years ago |
|
zxc
|
e78a72ec5c
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_temp
|
5 years ago |
|
zxc
|
9ae6528aaa
|
login接口
|
5 years ago |
sunyuchao
|
eae6cd44e2
|
解决冲突 entity添加注解
|
5 years ago |
wangchao
|
21a8a69df7
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_temp
|
5 years ago |
|
wangchao
|
1cb0bc2ec9
|
/sso 获取用户最近访问的网格请求类型修改
|
5 years ago |
wxz
|
edd0c3760d
|
Merge branch 'dev_mq_init_customer' into dev
# Conflicts:
# epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java
# epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java
# epmet-module/epmet-message/epmet-message-server/pom.xml
|
5 years ago |
|
zxc
|
2b26198125
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_temp
|
5 years ago |
|
zxc
|
60b3184fea
|
login接口
|
5 years ago |
|
zxc
|
3d1a571cd3
|
login接口
|
5 years ago |
|
wxz
|
b1be2ddb11
|
Merge branch 'dev_mq_init_customer' into dev_temp
|
5 years ago |
|
wxz
|
e8e885c02e
|
删除错误提交的SSOLoginController
|
5 years ago |
|
zxc
|
fcd1df887b
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_temp
|
5 years ago |
|
zxc
|
0d4c800432
|
login接口
|
5 years ago |
|
wxz
|
4a94e86dbd
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_jcet
|
5 years ago |
|
wxz
|
facda9c629
|
第三方平台：修改查询用户byTicket方法
|
5 years ago |
|
zxc
|
9d7b1cfff2
|
login接口
|
5 years ago |
zhaoqifeng
|
123d9f2ee1
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
90e7ea00fa
|
代码上传
|
5 years ago |
|
zhaoqifeng
|
1d76c7b500
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
e0af1884fa
|
代码上传
|
5 years ago |
|
wxz
|
23efd3a65c
|
新增系统消息表
|
5 years ago |
|
wxz
|
9c6835bb48
|
请求第三方生成签名，用常量代替魔法值
|
5 years ago |
|
wxz
|
c220fdd269
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_jcet
|
5 years ago |
|
wxz
|
37bac23a5f
|
将jcetApiService的实例化，从@Component改为ThirdplatConfig中统一实例化
|
5 years ago |
|
zxc
|
543a6cf536
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_temp
|
5 years ago |
|
zxc
|
2fbbe4b4e9
|
login接口
|
5 years ago |
|
zxc
|
eb94960987
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_temp
# Conflicts:
# epmet-commons/pom.xml
# epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
5 years ago |
|
zxc
|
4c43dca2ad
|
login接口
|
5 years ago |
|
wxz
|
4de75be633
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_jcet
|
5 years ago |
|
wxz
|
5596bf1bbf
|
修改部分与第三方平台调用相关代码
|
5 years ago |
|
sunyuchao
|
66c91053f7
|
推送微信消息按客户类型推送
|
5 years ago |
yinzuomei
|
601687cc51
|
添加注释
|
5 years ago |
|
zhaoqifeng
|
4f4977c24d
|
客户初始化时，只有小程序类型的客户设置服务器域名
|
5 years ago |
|
zhaoqifeng
|
898a35eaaa
|
Merge branches 'dev' and 'dev_jcet' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jcet
|
5 years ago |
|
zhaoqifeng
|
16b4d0fcd5
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
zhaoqifeng
|
4b7ab53d2e
|
pa_customer表添加type字段
|
5 years ago |
|
zhaoqifeng
|
a99daf737b
|
pa_customer表添加type字段
|
5 years ago |
|
wxz
|
973c253b4b
|
新增：第三方平台模块相关代码修改
|
5 years ago |
|
wxz
|
fc38ce5d03
|
Merge remote-tracking branch 'origin/dev_jcet' into dev_jcet
|
5 years ago |
|
wxz
|
5db91f665d
|
新增：第三方平台模块相关代码init
|
5 years ago |
|
zhaoqifeng
|
2675f80290
|
pa_customer表添加type字段
|
5 years ago |
|
wangchao
|
882af3333e
|
/sso 根据地区码获取相关网格列表；获取用户最近访问的网格。
|
5 years ago |
|
zxc
|
30e441f2c8
|
上传controller，service
|
5 years ago |
|
sunyuchao
|
a1c3b79edb
|
解决冲突
|
5 years ago |
|
wangchao
|
bb06e23d29
|
Merge remote-tracking branch 'origin/dev_add_customer_id' into dev_add_customer_id
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java
|
5 years ago |
|
sunyuchao
|
c66e9a6b1e
|
role_operation、role_scope、customer_home_detail、project_org_relation、project_related_personnel、staff_wechat、user、staff_role、user_wechat 添加客户ID 对应sql脚本还未提交
|
5 years ago |
|
zxc
|
dd2cdb15c2
|
district
|
5 years ago |
|
yinzuomei
|
5a5dfe1f27
|
区直部门-治理能力修改end2
|
5 years ago |
|
yinzuomei
|
436889cc47
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev
|
5 years ago |
