Merge remote-tracking branch 'origin/master'

cuilei

5 天以前 8ac573030c8fc795d9a30afb739f44393f8b63eb

 src/main/java/org/jeecg/modules/andon/service/IAndonResponseConfigService.java

@@ -15,12 +15,7 @@
public interface IAndonResponseConfigService extends IService<AndonResponseConfig> {
    AndonResponseConfig getAndonResponseConfigByFactoryIdAndButtonId(String factoryId, String buttonId);

    /**
     * 根据工厂id查询按钮列表
     * @param factoryId 工厂id
     * @return
     */
    List<AndonButtonDTO> queryAndonButtonList(String factoryId);



    /**