Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-10 9e3ba891ab4439760d33ff5c12b7405273d0ed95

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -119,8 +119,12 @@
                #{id}
            </foreach>
         </if>
         and (master_ids like concat('%',#{classifyIdFront}, '%') or master_ids like concat('%',#{classifyIdAfter}, '%'))
         <if test="classifyIdFront!=null and classifyIdFront!='' and classifyIdAfter!=null and classifyIdAfter!=''">
            and (master_ids like concat('%',#{classifyIdFront}, '%') or master_ids like concat('%',#{classifyIdAfter}, '%'))
         </if>

         </where>
         order by transaction_num
    </select>