Merge remote-tracking branch 'origin/2-10' into 2-10

zj

9 days ago 55aff996cb51698c09ab140143511e74c7a8ad5e

 src/main/java/com/nq/controller/backend/AdminPositionController.java

@@ -86,7 +86,7 @@
    @RequestMapping({"addUserPosition.do"})
    @ResponseBody
    public ServerResponse newStockToPosition(@RequestParam("id")Integer id) {
        return this.iUserPositionService.newStockToPosition(id);
        return this.iUserPositionService.newStockToPosition(id,BigDecimal.ZERO);
    }

}