Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
commit
c093184e65
@ -1,6 +1,6 @@
|
||||
if @notice && @notice.end_time > Time.now
|
||||
json.system_update true
|
||||
json.system_score @notice.rstrip
|
||||
json.system_score @notice.notes.rstrip
|
||||
json.(@notice, :subject, :start_time, :end_time)
|
||||
else
|
||||
json.system_update false
|
||||
|
Loading…
Reference in new issue