Merge remote-tracking branch 'origin/master'

CeDo

2021-04-27 d2fe6196f1991d10b48adf2debf8521b34f4c461

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

@@ -349,9 +349,9 @@
    void deleteStoreByPhoneAndStatus(@RequestParam("phone") String phone);

    @Select("update sys_user set" +
            " card_photo_front = #{userArchivesVO.cardPhotoFront}" +
            "and card_photo_back = #{userArchivesVO.cardPhotoBack}" +
            "and family_book = #{userArchivesVO.familyBook}" +
            " card_photo_front = #{userArchivesVO.cardPhotoFront} \n" +
            ", card_photo_back = #{userArchivesVO.cardPhotoBack} \n" +
            ",family_book = #{userArchivesVO.familyBook} \n" +
            " where user_id = #{userArchivesVO.userId}")
    void updateUserArchives(@Param("userArchivesVO") UpdateUserArchivesVO userArchivesVO);