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

yanghui

2022-11-10 ec96abc7c3d9ef48b00c321eed85f9d934c699a5

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

@@ -90,4 +90,11 @@
     * @return
     */
    Integer updateIsPauseStatus(@Param("needDealIds") List<Long> needDealIds);

    /**
     * 设置相关联用户为启用状态
     * @param userId
     * @return
     */
    Integer enableUserStatus(@Param("userId") Long userId);
}