Merge branch 'api' into hive2.0

jyy

2021-01-25 949efdc17fa833f6511c0e5902057f3be0fe72c4

 zq-erp/src/main/java/com/matrix/system/hive/action/InstoreInfoController.java

@@ -19,7 +19,7 @@
import com.matrix.system.hive.bean.SysInstoreDetail;
import com.matrix.system.hive.bean.SysInstoreInfo;
import com.matrix.system.hive.dao.SysInstoreDetailDao;
import com.matrix.system.hive.plugin.util.DateUtils;
import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.plugin.util.MoneyUtil;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.SysInstoreInfoService;
@@ -290,7 +290,7 @@
            for (SysInstoreInfo item : dataList) {
                List<Object> temp = new ArrayList<>();
                temp.add(item.getInstoreId());
                temp.add(DateUtils.dateToString(item.getInstoreDate(), DateUtils.DATE_FORMAT_MM));
                temp.add(DateUtil.dateToString(item.getInstoreDate(), DateUtil.DATE_FORMAT_MM));
                temp.add(item.getSumall());
                temp.add(item.getMakingmanName());
                temp.add(item.getAppmanName());