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

huanghongfa

2021-09-27 7ed0f86229aa2c10b75e438cc1597e830ef684d5

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java

@@ -114,4 +114,12 @@
     * @return
     */
    List<ExportMerchantVO> exportMerchantByIds(@Param("needExportIds") List<Long> needExportIds);

    /**
     * 批量更新商家营业状态
     * @param convenientMerchantDOList
     * @param status
     * @return
     */
    int batchUpdateBusinessStatus(@Param("convenientMerchantDOList") List<ConvenientMerchantDO> convenientMerchantDOList, @Param("status") int status);
}