Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2023-04-07 601c3e854e74a15932fb502145f48cc0a773a611

1
2
3
4
5
var convert = require('./convert'),
    func = convert('mergeAll', require('../merge'));
 
func.placeholder = require('./placeholder');
module.exports = func;