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

java110

2021-09-04 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8

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

old mode 100644
new mode 100755
@@ -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}