合并冲突

shuishen

2021-06-03 cd411e7b3ade23951e8935924252f7059cc096d5

1
2
//>>built
define(["dojo/_base/kernel","./Calendar","./main"],function(a,b,c){a.deprecated("dijit._Calendar is deprecated","dijit._Calendar moved to dijit.Calendar",2);c._Calendar=b});