yinzuomei
|
3e88c025c0
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
# Conflicts:
# epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
|
4 years ago |
|
yinzuomei
|
4e0650ceee
|
评价
|
4 years ago |
jianjun
|
8c95689de7
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
55af5846f4
|
Merge branch 'dev_upgrade_mybatis_plus' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
732c429759
|
升级mybatis plus 3.4.2 客户id还是uuid吧
|
4 years ago |
wangxianzhang
|
23de12a9b5
|
Merge branch 'wxz_blockchain' into develop
|
4 years ago |
|
wangxianzhang
|
f81e6574a9
|
修改：
BlockChian producer，增加对enable标志的判断，决定是否启用BC的mq消息生产者
|
4 years ago |
|
yinzuomei
|
8e92658b0d
|
change topic
|
4 years ago |
|
jianjun
|
5f3c80a38c
|
Merge remote-tracking branch 'remotes/origin/dev_upgrade_mybatis_plus' into develop
|
4 years ago |
|
jianjun
|
ec6624171b
|
升级mybatis plus 3.4.2
|
4 years ago |
|
jianjun
|
3a271c37b3
|
Merge remote-tracking branch 'remotes/origin/dev_for_shibei_customerid' into develop
|
4 years ago |
|
jianjun
|
d2171ce68c
|
生产环境 暂时去掉 市北客户id 的指标原始数据抽取及 市北的指标计算（市北只支持 他们自己调用计算）
|
4 years ago |
|
jianjun
|
92296868e3
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
3963916031
|
干掉那个报错的
|
4 years ago |
|
jianjun
|
7f3ab51bac
|
意想不到的问题
|
4 years ago |
|
jianjun
|
b7da81fe6b
|
Merge branch 'dev_user_grid_work_2_jinan' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
064158e584
|
不默认
|
4 years ago |
|
jianjun
|
6ad58ba491
|
Merge remote-tracking branch 'remotes/origin/dev_user_grid_work_2_jinan' into dev
|
4 years ago |
|
jianjun
|
630048f221
|
上线吧
|
4 years ago |
|
jianjun
|
a76dd473d2
|
Merge branch 'dev_user_grid_work_2_jinan' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
d436a9a22e
|
改掉错误
|
4 years ago |
|
jianjun
|
bb8c29f590
|
Merge branch 'dev_user_grid_work_2_jinan' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
3e9f52db11
|
表名和类名统统换掉
|
4 years ago |
|
jianjun
|
27fed6a62b
|
Merge branch 'dev_user_grid_work_2_jinan' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
b4586286c7
|
表名和类名统统换掉
|
4 years ago |
|
jianjun
|
b0a7d05a6f
|
Merge branch 'dev_user_grid_work_2_jinan' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
63d17a6073
|
费劲
|
4 years ago |
|
jianjun
|
98fb950e6b
|
联调使用
|
4 years ago |
|
jianjun
|
49f3acf942
|
Merge remote-tracking branch 'remotes/origin/dev_user_grid_work_2_jinan' into develop
# Conflicts:
# epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
|
4 years ago |
|
jianjun
|
d4241760dd
|
不知道怎么着代码没了
|
4 years ago |
|
jianjun
|
ed438ac774
|
Merge branch 'dev_user_grid_work_2_jinan' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
3b00b13a6e
|
优化
|
4 years ago |
|
jianjun
|
e5f35db030
|
MQ漏掉的东西
|
4 years ago |
|
jianjun
|
c1e2ed5691
|
Merge branch 'dev_user_grid_work_2_jinan' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
ebc1a793ff
|
例行工作 对接中间库
|
4 years ago |
|
jianjun
|
0f25cc3e44
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
1da9e55f04
|
Merge branch 'dev_user_grid_work_2_jinan' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
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
|
4 years ago |
|
jianjun
|
d76b3f26ba
|
例行工作 对接中间库
|
4 years ago |
zhaoqifeng
|
2c5e7e140e
|
活动相关接口
|
4 years ago |
|
yinzuomei
|
973cf413d3
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
c07bb27e2d
|
user-demand-rel
|
4 years ago |
|
wangxianzhang
|
684093cdec
|
Merge branch 'dev_ic_mp' into develop
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
8d019ff6f4
|
Merge remote-tracking branch 'origin/dev_remove_elinkcloud' into dev_ic_mp
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
c72f5bc698
|
Merge remote-tracking branch 'origin/dev_remove_elinkcloud' into develop
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
# epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
# epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
87c2ed4945
|
解除对易联云的依赖
|
4 years ago |
|
yinzuomei
|
d53f70f444
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
759c42050e
|
/heart/userdemand/pagelist-analysis
|
4 years ago |
|
jianjun
|
b68ac17277
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
6fcd1ccdec
|
Merge remote-tracking branch 'remotes/origin/dev_grid_user_work' into develop
|
4 years ago |
|
jianjun
|
92a0354b4c
|
Merge remote-tracking branch 'remotes/origin/dev_grid_user_work' into dev
|
4 years ago |
