Merge branch 'ty_fix' into alpha

Helius

2021-11-08 15500d265a59ad3b7b7679276a83d9c5c92598dd

 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html

@@ -138,7 +138,7 @@
        layer.confirm('确定取消此订单？', {
            btn: ['确认', '取消'] //可以无限个按钮
        }, function(index, layero){
            $.post(basePath+'/admin/projService/cancelOrder?id='+id, {}, function(data){
            $.post(basePath+'/admin/projService/erpCancelOrder?id='+id, {}, function(data){
                parent.layer.msg(data.info,{icon: 1});
                layer.closeAll();
                myGrid.serchData();