合并冲突

shuishen

2021-06-03 cd411e7b3ade23951e8935924252f7059cc096d5

1
2
//>>built
define(["dojo/_base/declare"],function(a){return a("dojox.color.api.ColorModel",null,{constructor:function(){},initialize:function(a,b){},getColor:function(a){}})});