Merge branch 'local_20221024' into huacheng_test

yanghui

2022-11-01 d6f2a3d6c68cc2626b3a1baef7383e66a0f7a58e

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