Merge branch 'xinghong-dev' into 'master'

928255095

2021-09-07 65763d38cf9b6b8067a293d9c99297efea0de3e3

 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}