sunyuchao
|
8e90ed360a
|
Merge branches 'dev' and 'dev_voice_share_point' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice_share_point
|
5 years ago |
|
sunyuchao
|
5d6393cb3a
|
给话题附件表历史数据设置默认值
|
5 years ago |
|
sunyuchao
|
59f40700dc
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
92e401eef3
|
Merge branch 'dev_bugfix' into dev_temp
|
5 years ago |
|
sunyuchao
|
9bcd84636e
|
给话题附件表历史数据设置默认值
|
5 years ago |
yinzuomei
|
c8ef688509
|
Merge branches 'dev' and 'dev_voice_scan' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice_scan
|
5 years ago |
wxz
|
5b6b75cf45
|
版本升级
|
5 years ago |
|
sunyuchao
|
4eb7592726
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
ec5c0da879
|
调整排序
|
5 years ago |
|
sunyuchao
|
f9a5dd3ee7
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
575a9f1922
|
议题、项目接口查询已有分类接口返回的分类名称拼接上一级分类名称
|
5 years ago |
wangchao
|
753b8c0203
|
data-stats [prod] 版本号+1 -> 77
|
5 years ago |
|
wangchao
|
97b8409b60
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
wangchao
|
11fe6c7417
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
|
wangchao
|
5aa92157d4
|
数据统计-参与用户，范围调整为首次注册用户和其他网格注册的参与用户，排除跨网格首次注册用户。
|
5 years ago |
|
sunyuchao
|
b31b8e74fc
|
降低邀请入组和扫码入组的日志级别
|
5 years ago |
|
sunyuchao
|
6b67d29154
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
1add76f573
|
降低邀请入组和扫码入组的日志级别
|
5 years ago |
|
wangchao
|
7a55c4ca9b
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
5 years ago |
|
wangchao
|
e9ab4e1c65
|
查询标签缓存时对于特定场景强制报错
|
5 years ago |
|
yinzuomei
|
a22daa816a
|
gov-org,statis,+1
|
5 years ago |
|
yinzuomei
|
07b2e17e7a
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
wangchao
|
068fad9002
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
5 years ago |
|
wangchao
|
bc9002e5a8
|
查询标签时的补偿机制里，如果客户没有一套自己的标签数据，默认初始化一套数据进去，并放入缓存。
|
5 years ago |
|
wangchao
|
7f099d2ed1
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java
|
5 years ago |
|
wangchao
|
410488a767
|
修复:查询网格下注册用户时，将REGISTER = '1'改为FIRST_REGISTER = '1'，过滤掉之前因跨客户产生的数据。
|
5 years ago |
|
wangchao
|
c42c78469f
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
5 years ago |
|
wangchao
|
6c7d7240b7
|
标签缓存补偿修改
|
5 years ago |
|
yinzuomei
|
830f2b6c32
|
删除部门、网格、组织，编辑网格信息sql统一修改，需更新UPDATED_TIME，
|
5 years ago |
zhaoqifeng
|
53d6858be3
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
b77916377d
|
默认标签数据脚本
|
5 years ago |
|
yinzuomei
|
0fc2502075
|
report,statis,+1
|
5 years ago |
|
yinzuomei
|
3841267263
|
Merge remote-tracking branch 'origin/dev'
|
5 years ago |
|
yinzuomei
|
be433248be
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
5 years ago |
|
yinzuomei
|
ca3d09ef98
|
修改用户分布查询接口
|
5 years ago |
|
yinzuomei
|
5e625c6e2d
|
selectDifficulty方法修改EVENT_CATEGORY_NAME为null返回''
|
5 years ago |
zxc
|
b6bc63bb2a
|
screen_cpc_base_data删除去除dateId
|
5 years ago |
|
zxc
|
710708dec7
|
screen_cpc_base_data删除去除dateId
|
5 years ago |
|
wangchao
|
8537f1fe0d
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
5 years ago |
|
wangchao
|
e454251fcf
|
项目标签保存接口修改
|
5 years ago |
|
sunyuchao
|
abc479fae4
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
f1e6f33ee3
|
分类表联合主键引起的代码调整
|
5 years ago |
|
zxc
|
dd613eed12
|
标签添加修改
|
5 years ago |
|
wxz
|
423b48ff4f
|
版本升级
|
5 years ago |
|
wxz
|
c272db367e
|
Merge branch 'dev'
|
5 years ago |
|
wangchao
|
f508dbcae6
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp
|
5 years ago |
|
wangchao
|
952bd1d9de
|
Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category
|
5 years ago |
|
wangchao
|
f9a2d24239
|
标签查询，缓存的补偿机制修改
|
5 years ago |
|
sunyuchao
|
e66d0fe737
|
Merge branch 'dev_issue_category' into dev_temp
|
5 years ago |
|
sunyuchao
|
405e30dc9f
|
错题代码问题
|
5 years ago |
