Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

5 天以前 dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d

 src/main/java/com/ruoyi/approve/pojo/KnowledgeBase.java

@@ -22,7 +22,7 @@
    /**
     * 知识类型
     */
    @Excel(name = "知识类型",readConverterExp = "contract=合同特批,approval=审批案例,solution=解决方案,experience=经验总结,guide=操作指南")
    @Excel(name = "知识类型")
    private String type;
    /**
     * 适用场景