Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

11 小时以前 f065f051e4b4791d1f1657ce46cbf2e4de469ef7

 cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js

@@ -978,6 +978,7 @@
    }
    console.log("结果图片")
    console.log(imgOne)
    let name = $("#name").val();
    let quantityIssued = $("#quantityIssued").val();
    let pickUpQuantity = $("#pickUpQuantity").val();
    let editor = jQuery.trim(TGoodsInfoDlg.editor.getContent());
@@ -1011,6 +1012,7 @@
    },function(data){
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set("name",name);
    ajax.set("pointMerchandiseId",goodsId);
    ajax.set("quantityIssued",quantityIssued);
    ajax.set("pickUpQuantity",pickUpQuantity);