# Conflicts: # haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/LicenceOrderDTO.java # haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/LicenceOrderPageDTO.java # haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/licence/LicenceOrderPageVO.java # haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/licence/TabHaobanLicenceOrder.java # haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/licence/LicenceOrderVO.java