Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6

Conflicts:
	client/js/sourceManage/resourceManage.js

@@ -130,9 +130,9 @@ $(document).on("click", ".delbtn", function() {
     var item = g.rows[$(this).data("index")];
     common.dialog.confirm("警告", "是否确认删除？",function() {
         common.util.__ajax({
+            url: "/resources/deleteResourceById",
             //url: "/resources/deleteAllResourceByCode",
             //data: {code: item.code},
-            url: "/resources/deleteResourceById",
             data: {id: item.id},
         }, function () {
             g.reload();