Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

dev_forum
cxt 5 years ago
commit c093184e65

@ -1,6 +1,6 @@
if @notice && @notice.end_time > Time.now if @notice && @notice.end_time > Time.now
json.system_update true json.system_update true
json.system_score @notice.rstrip json.system_score @notice.notes.rstrip
json.(@notice, :subject, :start_time, :end_time) json.(@notice, :subject, :start_time, :end_time)
else else
json.system_update false json.system_update false

Loading…
Cancel
Save