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

peng

5 天以前 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85

 framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java

@@ -73,6 +73,13 @@
            "OR settlement_cycle LIKE concat('%,',#{day})"+
            "OR settlement_cycle = #{day}")
    List<StoreSettlementDay> getSettlementStore(int day);
    /**
     * 获取待结算店铺列表
     *
     * @return 待结算店铺列表
     */
    @Select("SELECT store_id,settlement_day FROM li_store_detail ")
    List<StoreSettlementDay> getAllSettlementStore();

    /**
     * 修改店铺的结算日