liushaowen
|
0fe2abcca9
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
liushaowen
|
0508d4ef47
|
Merge branch 'dev_personal_center' into dev_temp
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
|
5 years ago |
zxc
|
8b605530df
|
徽章
|
5 years ago |
|
liushaowen
|
a3ec6bacde
|
url修改
|
5 years ago |
|
liushaowen
|
9025367bdb
|
运营端用-ElementTree结构的Agency列表接口
|
5 years ago |
wangchao
|
7466655cdf
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
wangchao
|
27b90866d7
|
难点赌点 项目耗时 向下取整
|
5 years ago |
|
wangchao
|
baf9be54a1
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
wangchao
|
63af3a1a67
|
难点赌点添加阈值校验
|
5 years ago |
jianjun
|
ea37ac4335
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
jianjun
|
a28bcd4add
|
难点堵点 查询 如果查询条件为grid 则查询orgId
|
5 years ago |
|
jianjun
|
f250d9fb17
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data
|
5 years ago |
|
zxc
|
ab8638384c
|
徽章
|
5 years ago |
|
jianjun
|
7c0a388766
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
|
5 years ago |
|
jianjun
|
7acea8220b
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
36c306ee7a
|
获取本级和下级分数时返回 总分的原始值及总分对应的 上级指标的权重
|
5 years ago |
sunyuchao
|
6b44bdc894
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
sunyuchao
|
1f40553f96
|
重新激活订阅按钮操作
|
5 years ago |
|
jianjun
|
c8333ba646
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
9933217740
|
获取本级和下级分数时返回 总分的原始值及总分对应的 上级指标的权重
|
5 years ago |
|
wangchao
|
7b6edfbe89
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center
|
5 years ago |
|
wangchao
|
5f0eab13c9
|
缓存中没有客户勋章则去数据库查询
|
5 years ago |
|
zxc
|
1e664b6ec5
|
徽章点亮取消
|
5 years ago |
|
wangchao
|
d288d08ed6
|
用户勋章缓存修改.
|
5 years ago |
zhaoqifeng
|
b4b2f872e8
|
订阅相同模板时添加关键字限制
|
5 years ago |
|
wangchao
|
cca7e6eb30
|
用户勋章缓存修改
|
5 years ago |
|
wangchao
|
6b8131766a
|
用户勋章缓存
|
5 years ago |
|
sunyuchao
|
a2c777d10b
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
liushaowen
|
fc9e260913
|
userid改staffid
|
5 years ago |
|
zxc
|
037bff581d
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
liushaowen
|
faac1491d4
|
Merge branch 'dev_personal_center' of http://121.42.41.42:7070/r/epmet-cloud into dev_personal_center
|
5 years ago |
|
liushaowen
|
f6fd212bf5
|
fix
|
5 years ago |
|
zxc
|
fee41215cd
|
客户徽章初始化
|
5 years ago |
|
zxc
|
c4d9be84c1
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
b9121b2cb0
|
添加客户初始化缓存徽章方法
|
5 years ago |
|
liushaowen
|
4d781da2b4
|
驳回建组申请的订阅消息详情有误的bug
|
5 years ago |
|
liushaowen
|
837678bad7
|
Merge branch 'dev_personal_center' of http://121.42.41.42:7070/r/epmet-cloud into dev_personal_center
|
5 years ago |
|
liushaowen
|
4ab5801eff
|
用户建议init
|
5 years ago |
|
zxc
|
70a7dd20df
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
5 years ago |
|
zxc
|
2171e513f8
|
添加返回参数
|
5 years ago |
|
zxc
|
c34e6a619c
|
徽章列表
|
5 years ago |
|
zxc
|
d3b02c1c83
|
徽章列表
|
5 years ago |
wxz
|
501e2011ce
|
Merge branch 'dev_group_edit' into dev_temp
|
5 years ago |
|
wxz
|
37229e9df4
|
Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
wxz
|
0285fd866a
|
打开编辑小组信息的内容检查功能，测试
|
5 years ago |
|
zxc
|
590e34715b
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.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
|
3624ee5f18
|
徽章
|
5 years ago |
|
sunyuchao
|
2409d74954
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
sunyuchao
|
08a0433b04
|
外挂接口走安全校验
|
5 years ago |
|
sunyuchao
|
c0046df4a5
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
