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

zxl

3 天以前 d33b041f4b2a63a22682c9b3f344ef35f84b4542

 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();

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