Merge branch 'dev_aliyun' into develop

5 years ago · 159a7e1cac
parent e4490b9224 7635c4e526
commit 159a7e1cac
2 changed files with 0 additions and 1 deletions
--- a/lib/tasks/statistic_subject_info.rake
+++ b/lib/tasks/statistic_subject_info.rake
@ -134,7 +134,6 @@ namespace :subjects do
        buffer_size += 1
        if buffer_size == 1000
          sql = "REPLACE INTO subject_user_infos(#{column_value}) VALUES #{str}"
          puts sql
          ActiveRecord::Base.connection.execute sql
          str = ""
          buffer_size = 0
--- a/public/images/educoder/xcx/myinfobanner.png
+++ b/public/images/educoder/xcx/myinfobanner.png