Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java

@@ -225,7 +225,7 @@ public class BmsChannelController {
         List<BmsSupplier> supplierList = new ArrayList<>();
         if(supplierNames.size()>0) {
             LambdaQueryWrapper<BmsSupplier> supplierLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            supplierLambdaQueryWrapper.in(BmsSupplier::getCode, supplierNames);
+            supplierLambdaQueryWrapper.in(BmsSupplier::getName, supplierNames);
             supplierList = bmsSupplierService.list(supplierLambdaQueryWrapper);
             List<String> existSupplierName = supplierList.stream().map(a -> a.getName()).collect(Collectors.toList());
             if (supplierList.size() < supplierNames.size()) {

src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java

@@ -45,4 +45,5 @@ public class SysUserVo {
 
     private Object postInfo;
 
+    private String hrSystemInfo;
 }