Merge branch 'develop' into standalone_develop

This commit is contained in:
2022-02-15 17:33:55 +08:00
26 changed files with 452 additions and 70 deletions
+1 -1
View File
@@ -29,7 +29,7 @@
</div>
<div class="form-group ">
<label for="status">类型:</label>
<%= p.select :site_type, options_for_select(Site.site_types.map { |key, value| [key.humanize, key] }), {}, class: "form-control" %>
<%= p.select :site_type, options_for_select(Site.site_types.map { |key, value| [key.humanize, key] }, @site.site_type), {}, class: "form-control" %>
</div>
</div>
<div class="modal-footer">