Merge remote-tracking branch 'origin/master'

田源

2023-08-04 2c2e4083e42d405f65845c34928ba462de0c7943

 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/CombinationServiceImpl.java

@@ -110,7 +110,9 @@
    */
   @Override
   public List<Map<String, Object>> selectMaps() {
      List<Map<String, Object>> maps = listMaps(new QueryWrapper<Combination>().select("ID", "NAME"));
      List<Map<String, Object>> maps = listMaps(
         new QueryWrapper<Combination>().lambda().select(Combination::getId, Combination::getName)
      );
      return maps;
   }