Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html

@@ -42,9 +42,6 @@
                 <a class="btn btn-success" onclick="hanldAdd()" shiro:hasPermission="system:propertyinfo:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:propertyinfo:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:propertyinfo:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>