Skip to content

R
rbc-demo
Commit a9d2891f by raojiaguan
Options

冲突解决

parent e541c80a
Showing with 0 additions and 7 deletions
develop/@gms/gms-plugin-billexpand/src/emcon.js
...@@ -4339,20 +4339,13 @@ export default { ...@@ -4339,20 +4339,13 @@ export default {
"discard": false, "discard": false,
"path": "通用", "path": "通用",
"extends": { "extends": {
<<<<<<< Updated upstream
=======
"info": { "info": {
"param": [], "param": [],
<<<<<<< Updated upstream
"name": "SubTableSetBaseData", "name": "SubTableSetBaseData",
=======
"name": "MdFilterInfiniteValue",
>>>>>>> Stashed changes
"description": "例如MdFilterInfiniteValue(1.在该基础数据中他的扩展字段名:bm,2.上一个参数取到字段名后具体的值是多少如果你要从单据上取那就是xxx.code等等,以此类推两个参数为一组无限制的or方式过滤)", "description": "例如MdFilterInfiniteValue(1.在该基础数据中他的扩展字段名:bm,2.上一个参数取到字段名后具体的值是多少如果你要从单据上取那就是xxx.code等等,以此类推两个参数为一组无限制的or方式过滤)",
"title": "根据多个条件去过滤基础数据", "title": "根据多个条件去过滤基础数据",
"return": 0 "return": 0
} }
>>>>>>> Stashed changes
}, },
"description": "例如MdFilterInfiniteValue(1.在该基础数据中他的扩展字段名:bm,2.上一个参数取到字段名后具体的值是多少如果你要从单据上取那就是xxx.code等等,以此类推两个参数为一组无限制的or方式过滤)", "description": "例如MdFilterInfiniteValue(1.在该基础数据中他的扩展字段名:bm,2.上一个参数取到字段名后具体的值是多少如果你要从单据上取那就是xxx.code等等,以此类推两个参数为一组无限制的or方式过滤)",
"title": "根据多个条件去过滤基础数据", "title": "根据多个条件去过滤基础数据",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment