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

18516761980

2021-08-25 adc03660c3592d4d87076c4fefcbb86280610c4a

 src/main/java/com/zy/ints/controller/WaitMatinController.java

@@ -57,7 +57,7 @@
    @ManagerAuth
    public R getMatDataKV(@RequestParam(required = false) String condition) {
        Wrapper<MatCode> wrapper = new EntityWrapper<MatCode>()
                .andNew().like("mat_no", condition).or().like("mat_name", condition)
                .andNew().like("matnr", condition).or().like("maktx", condition)
                .orderBy("create_time", false);
        List<MatCode> mats = matCodeService.selectPage(new Page<>(1, 30), wrapper).getRecords();
        List<KeyValueVo> valueVos = new ArrayList<>();