You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

YYD-YY f38f389443 Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev ... # Conflicts: # ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquBaseController.java # ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquSupplierController.java # ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertMessageController.java # ALOps_sys_backend/alops-system/pom.xml # ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java # ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquSupplier.java # ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquVlan.java # ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquBaseQueryDto.java # ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlertMessageMapper.java # ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquBaseMapper.java # ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquSupplierMapper.java # ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertMessageService.java # ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquBaseService.java # ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquSupplierService.java # ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlertMessageServiceImpl.java # ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquBaseServiceImpl.java # ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquSupplierServiceImpl.java # ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquTypeServiceImpl.java # ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml # ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml # ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquSupplierMapper.xml		10 months ago
..
alops-ui	Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev	10 months ago