Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-10 2b9cdcbaccb6ea4c4ffe9461d0589ab3e28ef7f3

 flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java

@@ -49,14 +49,15 @@
     * @param matterName
     * @return
     */
    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,@Param("matterName") String matterName);
    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,@Param("matterName") String matterName,
                                            @Param("ids") List<String> ids);

    /**
     * 获取工单列表(求和)
     * @param matterName
     * @return
     */
    int countConfigList(@Param("matterName") String matterName);
    int countConfigList(@Param("matterName") String matterName,@Param("ids") List<String> ids);