Merge branch 'huacheng' into huacheng_test

101captain

2022-07-06 d6578ec702eb4fcff690d71ea3237a885f46b85c

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -18,6 +18,7 @@
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -453,6 +454,15 @@
    R updateUserIsPartymember(String idCard);

    /**
     * 修改用户的党员状态
     *
     * @param phone
     *            身份证号
     * @return 修改结果
     */
    R updateUserIsPartymemberByPhone(String phone);

    /**
     * 修改用户为非党员状态
     *
     * @param idCard
@@ -828,4 +838,19 @@
    R deleteUserCashByPhone(String phone);

    R updateUserPartyStatus(Long userId);

    /**
     * uu洗车登录
     * @param uuLoginVO
     * @return
     */
    R uuLogin(UuLoginVO uuLoginVO);

    /**
     * 导出验证密码
     * @param account
     * @param password
     * @return
     */
    R checkExport(@RequestParam("account")String account, @RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword);
}