FIX [更改字段名称]conflicts file for pull api

2026-05-24 13:45:44 +08:00 · 2021-06-25 17:31:23 +08:00
parent 8d300e11f9
commit 62d1a2378c
25 changed files with 170 additions and 105 deletions
--- a/app/models/laboratory.rb
+++ b/app/models/laboratory.rb
@@ -10,6 +10,7 @@
 #  sync_course  :boolean          default("0")
 #  sync_subject :boolean          default("0")
 #  sync_shixun  :boolean          default("0")
+#  is_local     :boolean          default("0")
 #
 # Indexes
 #