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 |
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 |
yinzuomei
|
436889cc47
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev
|
5 years ago |
|
zxc
|
2666896042
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev_temp
|
5 years ago |
|
zxc
|
f6b40bb7bf
|
tree
|
5 years ago |
|
yinzuomei
|
96794a182d
|
Merge remote-tracking branch 'origin/dev_areaCode' into dev_temp
|
5 years ago |
|
yinzuomei
|
fb07d8caa9
|
statis新增问题记录
|
5 years ago |
|
yinzuomei
|
c1c20ea005
|
dim_customer增加列area_code、screen_customer_agency/dept/grid增加列up_to_cal、新增customer_relation表
|
5 years ago |
|
sunyuchao
|
99939d86f7
|
Merge branch 'dev_thirdplatform' into dev
|
5 years ago |
|
sunyuchao
|
1c6f8620a9
|
"代小程序管理"页面数据排序调整
|
5 years ago |
|
zxc
|
5c5d610f38
|
dimCustomer初始化添加areaCode
|
5 years ago |
|
yinzuomei
|
8b6aec63ae
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev_areaCode
|
5 years ago |
|
yinzuomei
|
3e4fe9463a
|
Merge remote-tracking branch 'origin/dev_voice_scan' into dev
|
5 years ago |
|
yinzuomei
|
6363f4997f
|
Merge remote-tracking branch 'origin/dev_voice_scan' into dev_temp
|
5 years ago |
|
yinzuomei
|
e3ea5b86b7
|
Merge remote-tracking branch 'origin/dev_reg_party_bugfix' into dev
|
5 years ago |
|
sunyuchao
|
6ba59779bc
|
Merge branch 'dev_mess_party' into dev
|
5 years ago |
|
zxc
|
1708336fa2
|
短信发送
|
5 years ago |
|
wxz
|
24e998fc07
|
修复：pom->prod环境的active错误的配置成了test
|
5 years ago |
|
wangchao
|
d860857fcd
|
Merge remote-tracking branch 'origin/dev_reg_party_bugfix' into dev_temp
|
5 years ago |
|
sunyuchao
|
7e6f5e2c28
|
Merge branch 'dev_mess_party' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
|
5 years ago |
|
wangchao
|
730b892023
|
注册党员的bug修复①数据之间有依赖，调整逻辑执行的顺序，先生成用户缓存数据，再根据缓存里的注册网格Id进行初始化党员徽章②在检查用户是否是认证居民时，主表使用的baseInfo，左关联resiInfo，当baseInfo有值而resiInfo为空时会查出数据，被认为已经注册居民，但是此时用户并未生成注册居民的一系列数据，用户触发更新微信信息的接口时会初始化上baseInfo，改成内关联，只有当两边都有值时才能认定用户已经注册。
|
5 years ago |
|
yinzuomei
|
812116e5bd
|
Merge remote-tracking branch 'origin/dev_bugfix_screen' into dev
|
5 years ago |
|
sunyuchao
|
098b8c2a08
|
Merge branch 'dev_voice_share_point' into dev
|
5 years ago |
liushaowen
|
3e76a795bb
|
Merge branch 'dev_mess_party' into dev_temp
|
5 years ago |
|
liushaowen
|
fcf8392f29
|
Merge branch 'dev_mess_party' of http://121.42.41.42:7070/r/epmet-cloud into dev_mess_party
|
5 years ago |
|
liushaowen
|
0c3557dff2
|
消息订阅
|
5 years ago |
|
sunyuchao
|
d229df1ab2
|
Merge branch 'dev_mess_party' into dev_temp
|
5 years ago |
|
sunyuchao
|
b853e612b5
|
Merge remote-tracking branch 'origin/dev_mess_party' into dev_mess_party
|
5 years ago |
|
sunyuchao
|
c0721ee399
|
身边党员积分排序sql调整，积分相同的排序一样
|
5 years ago |
|
wangchao
|
1630085a52
|
在抽取难点赌点时不能因为没有图片或内容将其忽略。
|
5 years ago |
|
liushaowen
|
b1eda93a4c
|
Merge branch 'dev_mess_party' into dev_temp
|
5 years ago |
|
liushaowen
|
4b264791e2
|
订阅消息
|
5 years ago |
|
wangchao
|
ab75c460cc
|
项目抽取原始数据时对删除的项目进行清除
|
5 years ago |
|
yinzuomei
|
9329edb84c
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev
|
5 years ago |
