更正返回值，优化排版 (#88)

* 自定义任务40-基于区块链的分级诊疗数据共享案例分析 (#83) * DevSecretBallot (#86) * longjj2016 (#78) 1.修改之前问题，改为以下方法 10进制ascii转字符串 16进制ascii转字符串 2.文档描述更新 * 添加剪刀石头布的合约玩法 (#79) * add solidity file * add tutorial * add basic solidity tutorials * add assets * divergence * add divergence game * 增加func_call_contract.sol 及doc (#80) * Base64编解码库 (#81) * Counter: SimpleCounter; MultiSigCounter (#82) * 32 医疗卫生合约通用模版 (#84) * #32 医疗卫生合约模版 * 完善#32 医疗合约模版 * Solidity开发教程进阶版 (#85) * add solidity file * add tutorial * add basic solidity tutorials * add assets * divergence * add divergence game * advance solidity tutorial init * solidity tutorial advance Co-authored-by: longJJ2016 <1017303686@qq.com> Co-authored-by: 高野 <yekai1003@163.com> Co-authored-by: itherunder <61953384+itherunder@users.noreply.github.com> Co-authored-by: Kesling <43846775+Kesling515@users.noreply.github.com> Co-authored-by: kimroniny <1301862177@qq.com> Co-authored-by: Ferwoo <wufeiphil@163.com> * 更正返回值，优化排版 getTraceInfo 意为返回溯源信息而不是商品合约地址。 Co-authored-by: wzl521 <63525530+wzl521@users.noreply.github.com> Co-authored-by: JqLiu123 <85717832+JqLiu123@users.noreply.github.com> Co-authored-by: longJJ2016 <1017303686@qq.com> Co-authored-by: 高野 <yekai1003@163.com> Co-authored-by: itherunder <61953384+itherunder@users.noreply.github.com> Co-authored-by: Kesling <43846775+Kesling515@users.noreply.github.com> Co-authored-by: kimroniny <1301862177@qq.com> Co-authored-by: Ferwoo <wufeiphil@163.com>

Author: 9 people

contracts/business_template/traceability/TraceabilityFactory.sol

@@ -1,4 +1,5 @@
 pragma solidity ^0.4.25;
+pragma experimental ABIEncoderV2;
 
 import "./Traceability.sol";
 
@@ -9,10 +10,10 @@ contract TraceabilityFactory{
  }
  mapping(bytes32=>GoodsTrace) private _goodsCategory;
 
-event newTraceEvent(bytes32 goodsGroup);
+ event newTraceEvent(bytes32 goodsGroup);
 
-//Create traceability commodity category
- function createTraceability(bytes32 goodsGroup)public returns(Traceability) {
+ //Create traceability commodity category
+ function createTraceability(bytes32 goodsGroup) public returns(Traceability) {
  require(!_goodsCategory[goodsGroup].valid,"The trademark already exists" );
  Traceability category = new Traceability(goodsGroup);
  _goodsCategory[goodsGroup].valid = true;
@@ -21,32 +22,32 @@ contract TraceabilityFactory{
  return category;
  }
 
-  function getTraceability(bytes32 goodsGroup)private view returns(Traceability) {
-  require(_goodsCategory[goodsGroup].valid,"The trademark has not exists" );
-  return _goodsCategory[goodsGroup].trace;
+ function getTraceability(bytes32 goodsGroup) private view returns(Traceability) {
+ require(_goodsCategory[goodsGroup].valid,"The trademark has not exists" );
+ return _goodsCategory[goodsGroup].trace;
  }
  //Create traceability products 
- function createTraceGoods(bytes32 goodsGroup, uint64 goodsId)public returns(Goods) {
+ function createTraceGoods(bytes32 goodsGroup, uint64 goodsId) public returns(Goods) {
  Traceability category = getTraceability(goodsGroup);
-  return category.createGoods(goodsId);
+ return category.createGoods(goodsId);
  }
 
  //Change product status
- function changeTraceGoods(bytes32 goodsGroup, uint64 goodsId, int16 goodsStatus, string memory remark)public{
-  Traceability category = getTraceability(goodsGroup);
-  category.changeGoodsStatus(goodsId, goodsStatus, remark);
+ function changeTraceGoods(bytes32 goodsGroup, uint64 goodsId, int16 goodsStatus, string memory remark) public {
+ Traceability category = getTraceability(goodsGroup);
+ category.changeGoodsStatus(goodsId, goodsStatus, remark);
  }
 
  //Query the current status of goods
-  function getStatus(bytes32 goodsGroup, uint64 goodsId)public view returns(int16){
-  Traceability category = getTraceability(goodsGroup);
-  return category.getStatus(goodsId);
+ function getStatus(bytes32 goodsGroup, uint64 goodsId) public view returns(int16) {
+ Traceability category = getTraceability(goodsGroup);
+ return category.getStatus(goodsId);
  }
 
  //The whole process of querying goods
-  function getTraceInfo(bytes32 goodsGroup, uint64 goodsId)public view returns(Goods){
-  Traceability category = getTraceability(goodsGroup);
-  return category.getGoods(goodsId);
+ function getTraceInfo(bytes32 goodsGroup, uint64 goodsId) public view returns(Goods.TraceData[]) {
+ Traceability category = getTraceability(goodsGroup);
+ return category.getGoods(goodsId).getTraceInfo();
  }
 
  function getGoodsGroup(string memory name) public pure returns (bytes32) {