Merge branch 'test' into 'master'

罗yu 元桥

2021-05-07 6c4db89ea8795d6be8431f698051e62bec9ec956

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -246,7 +246,8 @@
            "u.continuous_landing_days + 1,\n" +
            "0)")
    int timedTaskContinuousLandingDays();
    @Select("select state from com_mng_volunteer_mng where phone=#{phone} order by create_at desc limit 1")
    @Select("select id,create_at,state,name,phone,photo_path,political_face,reject_reson,apply_reson,address,age,job,integral,community_id,submit_user_id " +
            " from com_mng_volunteer_mng where phone=#{phone} order by create_at desc limit 1")
    ComMngVolunteerMngVO selectVolunteerMngByPhone(String phone);
    @Update("update sys_user set face_state=null where user_id=#{userId}")
    int updateFaceState(Long userId);
@@ -355,4 +356,10 @@
            " where user_id = #{userArchivesVO.userId}")
    void updateUserArchives(@Param("userArchivesVO") UpdateUserArchivesVO userArchivesVO);

    @Select("update com_pb_member set user_id = #{userId} where audit_result = 1 and id_card = #{idCard}")
    void updateComPbMemberUserId(@Param("idCard")String idCard, @Param("userId")Long userId);

    @Select("select id from com_pb_member where audit_result = 1 and id_card = #{idCard}")
    Long getPartyBuildingByIdCard(@Param("idCard")String idCard);

}