Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

Your Name

2023-07-11 d7d9b601b2e4fdb663375993e2cfbdbd363df421

 java110-db/src/main/resources/mapper/user/ActivitiesBeautifulStaffServiceDaoImplMapper.xml

@@ -47,6 +47,9 @@
        <if test="staffId !=null and staffId != ''">
            and t.staff_id= #{staffId}
        </if>
        <if test="staffName !=null and staffName != ''">
            and uu.name like '%${staffName}%'
        </if>
        order by t.create_time desc
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}