Merge branch 'master' of http://git.yoho.cn/ufo/ufo-platform

# Conflicts:
#	pom.xml

@@ -34,6 +34,10 @@
             <groupId>com.yoho.ufo</groupId>
             <groupId>com.yoho.ufo</groupId>
             <artifactId>ufo-platform-common</artifactId>
             <artifactId>ufo-platform-common</artifactId>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>com.yoho.ufo.model</groupId>
+            <artifactId>order-ufo-model</artifactId>
+        </dependency>
     </dependencies>
     </dependencies>
 
 
 </project>
 </project>

@@ -200,8 +200,8 @@
         function editRow(id) {
         function editRow(id) {
             var skup = id;
             var skup = id;
             var div = $("<div>").appendTo($(document.body));
             var div = $("<div>").appendTo($(document.body));
-            var message = "确认取消售卖吗？";
-            window.top.$.messager.confirm("确认", message, function (flag) {
+            var message = "确定要取消售卖此件商品吗？商品取消售卖后，卖家的该件商品强制下架，退还卖家保证金";
+            window.top.$.messager.confirm("取消售卖提醒", message, function (flag) {
                 if (flag) {
                 if (flag) {
                     window.top.$.messager.progress({
                     window.top.$.messager.progress({
                         title: "正在执行",
                         title: "正在执行",
@@ -213,9 +213,9 @@
                         window.top.$.messager.progress("close");
                         window.top.$.messager.progress("close");
                         if (data.code == 200) {
                         if (data.code == 200) {
                             $("#skupTable").myDatagrid("reload");
                             $("#skupTable").myDatagrid("reload");
-                            window.top.$.messager.show({title: "提示",msg: msg, height: 120});
+                            window.top.$.messager.show({title: "提示", msg: '操作成功', height: 120});
                         } else {
                         } else {
-                            window.top.$.messager.alert("失败", data.message, "error");
+                            window.top.$.messager.alert("失败", '操作失败', "error");
                         }
                         }
                     }, "json");
                     }, "json");
                 }
                 }