Merge remote-tracking branch 'origin/dev' into dev

peng

5 天以前 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85

 framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java

@@ -142,6 +142,10 @@
    public List<StoreSettlementDay> getSettlementStore(int day) {
        return this.baseMapper.getSettlementStore(day);
    }
    @Override
    public List<StoreSettlementDay> getAllSettlementStore() {
        return this.baseMapper.getAllSettlementStore();
    }

    @Override
    public StoreDeliverGoodsAddressDTO getStoreDeliverGoodsAddressDto() {