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

Junjie

2023-11-27 5ac80d6a06f686a62c307c52c652e511e3896fb7

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

@@ -198,9 +198,9 @@
    public R siteDetlUpdate(@RequestParam Integer devNo,
                            @RequestParam Short workNo,
                            @RequestParam Short staNo,
                            @RequestParam String pakMk,
                            @RequestParam Boolean inEnable,
                            @RequestParam Boolean outEnable
                            @RequestParam(required = false) String pakMk,
                            @RequestParam(required = false) Boolean inEnable,
                            @RequestParam(required = false) Boolean outEnable
    ) {
        BasDevp basDevp = basDevpService.selectById(devNo);
        if (basDevp == null) {