Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-12 0ef5931c06034908b346187c849acdcf413953c2

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml

@@ -43,6 +43,12 @@
        <if test="farm.deptId!=null and farm.deptId!=''">
            and dept_id = #{farm.deptId}
        </if>
        <if test="farm.ids!=null and farm.ids!=''">
            and id in
            <foreach item="id" collection="farm.ids.split(',')" open="(" separator=" , " close=")">
                #{id}
            </foreach>
        </if>
    </select>

    <!--自定义修改农场围栏数据-->

 src/main/java/org/springblade/modules/farm/vo/FarmVO.java

@@ -15,4 +15,6 @@
public class FarmVO extends Farm {
    private static final long serialVersionUID = 1L;

    private String ids;

}