Merge remote-tracking branch 'origin/master'

YYC

2023-07-07 8c3544c7ff6f6820d36e24af6d6e72b7e9cba75a

 igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java

@@ -289,6 +289,8 @@
        if (null != conf) conf.setSort(sort);
        view.addObject("cardDto", conf);

        //称重页面初始化
        inoutManager.initInoutWeight(listInoutConf,sort);

        view.setViewName("admin/inout/in-weight");
        return view;