Merge remote-tracking branch 'origin/master'

王佳豪

2021-06-19 2ba85fe129286f6f6fc0a19365926f37574b9a05

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

@@ -163,7 +163,7 @@
            param.getNormalList().get(i).setAppeUser(userId);
            param.getNormalList().get(i).setAppeTime(timeNow);
        }
        locNormalService.locNormalIn(param.getNormalList());
        locNormalService.locNormalInSource(param.getNormalList());
        return R.ok();
    }