ludc
2023-06-15 f2e8b17c7df35a8efb3b32d821bea54775b253ab
解决冲突
已修改2个文件
3 ■■■■ 文件已修改
Source/UBCS-WEB/vue.config.js 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/vue.config.js
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -938,7 +938,8 @@
     * @param attrName 属性的名字
     * @return true 表示应该忽略
     */
    boolean checkUnAttrUnEdit(String attrName){
    @Override
    public boolean checkUnAttrUnEdit(String attrName){
        return  (VciQueryWrapperForDO.OID_FIELD.equalsIgnoreCase(attrName)
            ||"ts".equalsIgnoreCase(attrName)
            || "lastmodifier".equalsIgnoreCase(attrName)