记得上下班打卡 | git大法好,push需谨慎

Commit a3869ddc authored by wangyifan's avatar wangyifan

Merge branch 'dev-caomeihuzhao-bug2' into 'master'

草莓护照bug修复

See merge request !416
parents cf133df8 c6dff848
......@@ -67,7 +67,7 @@
IFNULL(b.icon, '') AS icon,
IFNULL(b.share_text, '') AS shareText,
IFNULL(b.type, 0) AS type,
IFNULL(b.performance_id, '') AS performanceId,
performance_id AS performanceId,
ub.created_at AS claimedAt,
ub.source AS source
FROM adam_caomei_user_badge ub
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment