Merge branch 'huacheng_push' into huacheng_test

zhaozhengjie

2022-09-09 8cdaf6e5eacd24f6f0691ef8b430c43339f4ac5e

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