Sen descrición

13660505945 e908b19a08 Merge remote-tracking branch 'origin/xq' hai 1 mes
docs 6932537551 商品类型编码修改,商品信息修改 hai 1 mes
jshERP-web e908b19a08 Merge remote-tracking branch 'origin/xq' hai 1 mes
src 1c6e3ec30e Merge remote-tracking branch 'origin/master_huangjunjie' hai 1 mes
pom.xml 47dacaf0f9 代码合并,冲突处理 hai 1 mes