Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 flower_city/src/main/java/com/dg/core/service/IElseAccessoryService.java

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

    /**
     * 获取附件列表全部
     * @param Name
     * @return
     */
    public List<ElseAccessoryEntity> selectConfigList(String Name);
    public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids);


    /**
@@ -51,7 +52,7 @@
     * @param Name
     * @return
     */
    public int countNum(String Name);
    public int countNum(String Name,List<String> ids);


}