• yzc's avatar
    Merge branch 'develop' into v2 · 00c4fae5
    yzc authored
    # Conflicts:
    #	.idea/misc.xml
    #	contract-service/src/main/java/com/ssy/lingxi/contract/esign/api/FileTemplate.java
    #	contract-service/src/main/java/com/ssy/lingxi/contract/repository/SignatureAuthLogRepository.java
    #	contract-service/src/main/java/com/ssy/lingxi/contract/serviceimpl/mobile/MobileSignatureAuthServiceImpl.java
    #	contract-service/src/test/java/com/ssy/lingxi/contract/ContractSignTest.java
    #	order-service/src/main/java/com/ssy/lingxi/order/esign/response/FileDetailResponse.java
    #	order-service/src/main/java/com/ssy/lingxi/order/repository/ProcurementOrderRepository.java
    #	platform-template-service/src/main/java/com/ssy/lingxi/platform/template/service/controller/web/MemberShopWebController.java
    #	platform-template-service/src/main/java/com/ssy/lingxi/platform/template/service/service/web/MemberShopWebService.java
    #	platform-template-service/src/main/java/com/ssy/lingxi/platform/template/service/serviceimpl/web/MemberShopWebServiceImpl.java
    #	product-service/product-service-api/src/main/java/com/ssy/lingxi/product/api/enums/FreightStatusEnum.java
    #	product-service/product-service-api/src/main/java/com/ssy/lingxi/product/api/model/request/warehouse/ShopRequest.java
    #	product-service/product-service-api/src/main/java/com/ssy/lingxi/product/api/model/response/warehouse/InvoicesListResponse.java
    #	product-service/src/main/java/com/ssy/lingxi/product/handler/init/FreightSpaceHandler.java
    #	product-service/src/main/java/com/ssy/lingxi/product/service/FreightSpaceService.java
    #	product-service/src/main/java/com/ssy/lingxi/product/serviceImpl/FreightSpaceServiceImpl.java
    #	scheduler-service/src/main/resources/application-dev.yml
    #	system-service/src/main/java/com/ssy/lingxi/system/service/impl/PageTemplateServiceImpl.java
    #	transaction-service/src/main/java/com/ssy/lingxi/transaction/service/InquiryListService.java
    #	warehouse-service/src/main/resources/application.yml
    #	warehouse-service/warehouse-service-api/src/main/java/com/ssy/lingxi/warehouse/api/dto/request/FreightSpaceUpdataRequest.java
    00c4fae5
Name
Last commit
Last update
..
scheduler-service-api Loading commit data...
src/main Loading commit data...
build.gradle Loading commit data...
settings.gradle Loading commit data...