Merge branch 'dev6.8.5-2899' into test6.8.5

@@ -25,7 +25,7 @@
     select 
     count(id)
     from seller_wallet_detail
-    where uid = #{uid,jdbcType=INTEGER} and is_batch = 0 and type in (31,32,33)
+    where uid = #{uid,jdbcType=INTEGER} and is_batch = 0 and type in (31,32,33,34)
   </select>
 
  

@@ -44,10 +44,11 @@
             width: 150,
             editable : false,
             data: [
-                {"text" : "违规类型", "value" : "31,32,33", "selected": true},
+                {"text" : "违规类型", "value" : "31,32,33,34", "selected": true},
                 {"text" : "卖家不卖", "value" : 31},
                 {"text" : "超时未发货", "value" : 32},
                 {"text" : "鉴定不通过", "value" : 33},
+                {"text" : "鉴定中心收货前客服取消", "value" : 34},
             ]
         });
         $("#marginTable").myDatagrid({