Merge branch 'develop-raojiaguan' into 'develop'

冲突解决

See merge request GFP/RBC/rbc-frontend!106

develop/@gms/gms-plugin-billexpand/src/emcon.js

@@ -4339,20 +4339,13 @@ export default {
 			"discard": false,
 			"path": "通用",
 			"extends": {
-<<<<<<< Updated upstream
-=======
 				"info": {
 					"param": [],
-<<<<<<< Updated upstream
 					"name": "SubTableSetBaseData",
-=======
-					"name": "MdFilterInfiniteValue",
->>>>>>> Stashed changes
 					"description": "例如MdFilterInfiniteValue(1.在该基础数据中他的扩展字段名:bm,2.上一个参数取到字段名后具体的值是多少如果你要从单据上取那就是xxx.code等等,以此类推两个参数为一组无限制的or方式过滤)",
 					"title": "根据多个条件去过滤基础数据",
 					"return": 0
 				}
->>>>>>> Stashed changes
 			},
 			"description": "例如MdFilterInfiniteValue(1.在该基础数据中他的扩展字段名:bm,2.上一个参数取到字段名后具体的值是多少如果你要从单据上取那就是xxx.code等等,以此类推两个参数为一组无限制的or方式过滤)",
 			"title": "根据多个条件去过滤基础数据",