-
# Conflicts: # src/main/java/com/huaheng/common/utils/DateUtils.java # src/main/java/com/huaheng/common/utils/http/OkHttpUtils.java # src/main/java/com/huaheng/pc/config/station/service/StationService.java # src/main/java/com/huaheng/pc/monitor/job/task/RyTaskKS.java # src/main/resources/application-druid.properties # src/main/resources/application.yml
-
# Conflicts: # src/main/java/com/huaheng/api/wcs/controller/EmptyContainerController.java # src/main/resources/static/huaheng/js/huahengUI.js
-
添加https支持的初始证书keystore.p12和配置,默认为不启用 server.ssl.enable=false
-
Conflicts: src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java src/main/java/com/huaheng/pc/receipt/receiptHeader/mapper/ReceiptHeaderMapper.java src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml src/main/resources/templates/config/material/material.html
-
2. 解决入库的一些bug
-
Conflicts: src/main/resources/application-druid.properties