Merge branch 'develop' into standalone_develop

app/views/admins/project_categories/_form_modal.html.erb

@@ -21,6 +21,7 @@
             </label>
             <%= p.number_field :pinned_index,class: "form-control input-lg",placeholder: "精选等级",required: true%>
           </div>
+          <%if false%>
           <div class="logo-item">
             <% logo_img = @project_category.logo_url %>
             <div class="logo-item-left mr-3 <%= logo_img ? 'has-img' : '' %>">
@@ -34,6 +35,7 @@
               <div>尺寸：高度38px以内，宽等比例缩放</div>
             </div>
           </div>
+          <% end %>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>