Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-14 7b7ae2fbc3c43cf08949b2fd8949ea6c17b3c129

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

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

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


    /**