• wangrican's avatar
    Merge branch 'develop' into v2 · c41f47af
    wangrican authored
    # Conflicts:
    #	common/src/main/java/com/ssy/lingxi/common/response/ResponseCode.java
    #	contract-service/src/main/java/com/ssy/lingxi/contract/controller/ContractFeignController.java
    #	enhance-service/build.gradle
    #	merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/serviceimpl/web/MemberRoleServiceImpl.java
    #	order-service/src/main/java/com/ssy/lingxi/order/controller/PurchaseOrderController.java
    #	product-service/build.gradle
    #	purchase-service/src/main/java/com/ssy/lingxi/purchase/handler/exception/HystrixExceptionHandler.java
    #	scheduler-service/build.gradle
    c41f47af
application-dms.yml 1.88 KB