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

gdg

2021-01-18 b02535c9a99324823812f6c2d08f066d8e1ba75f

 src/main/java/com/nanometer/smartlab/service/EncodeReplaceDictServiceImpl.java

@@ -24,6 +24,8 @@
            params.put("number", encodeReplaceDictFilter.getNumber());
            params.put("type", encodeReplaceDictFilter.getType());
        }
        params.put("first", offset);
        params.put("pageSize", pageSize);
        return encodeReplaceDictMapper.selectAll(params);
    }