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

1

昨天 e596214d84efa77d0cf316563548f1b1d7643a37

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -211,7 +211,7 @@
//    @ManagerAuth(memo = "组托")
    public R combAutoWcs(@RequestBody CombParam combParam){
//        mobileService.comb(combParam, getUserId());
        mobileService.comb(combParam, 7777L);
        mobileService.combAuto(combParam, 7777L);
        return R.ok("组托成功");
    }