Sign in

wms / wms4_shanghaianbofu · Files

Logo

GitLab

  • Back to group
  • Project
  • Activity
  • Files
  • Commits
  • Network
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • wms4_shanghaianbofu
  • huaheng-wms-core
  • src
  • main
  • resources
  • application.yml
  • Merge branch 'anbofu' of http://www.huahengrobot.com:90/wms/wms4_shanghaianbofu into anbofu ...
    5ac63fc9
    # Conflicts:
    #	ant-design-vue-jeecg/src/api/api.js
    #	ant-design-vue-jeecg/src/views/system/config/ContainerList.vue
    #	ant-design-vue-jeecg/src/views/system/config/LocationList.vue
    #	ant-design-vue-jeecg/src/views/system/config/ParameterConfigurationList.vue
    #	ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue
    #	ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
    #	ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
    #	ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue
    #	ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue
    #	ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
    #	ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
    #	ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
    #	ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/LoginController.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/service/impl/MobileService.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/controller/WcsController.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/LocationAllocationServiceImpl.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/IContainerService.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/locationMonitor/controller/LocationMonitorController.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/controller/TestController.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/IInventoryDetailService.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/MesTask.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/WcsTask.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/dto/TableCleanDto.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/controller/ShipmentCombinationController.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/service/impl/AgvTaskServiceImpl.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/entity/TaskDetail.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
    #	huaheng-wms-core/src/main/java/org/jeecg/utils/HuahengJwtUtil.java
    #	huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/ApiAuthenticationAspect.java
    #	huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/ApiLoggerAspect.java
    #	huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/LogRecordAspect.java
    #	huaheng-wms-core/src/main/java/org/jeecg/utils/support/SystemAuthentication.java
    #	huaheng-wms-core/src/main/resources/application-dev.yml
    #	huaheng-wms-core/src/main/resources/application.yml
    肖超群 authored
    2023-03-31 21:51:12 +0800  
    Browse File »
application.yml 205 Bytes
Edit Raw Blame History
1 2 3 4 5 6 7 8 9 10 11 12
spring:
  application:
    name: huaheng-wms-core
  profiles:

    active: dev

huaheng:
  system:
    verson: '@project.version@'
    artifactId: '@project.artifactId@'
    checkSystemActivationCode: true