Merge remote-tracking branch 'origin/master'

# Conflicts:
#	modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.IDataMoreService;
+import cn.estsh.i3plus.core.apiservice.dao.IFactoryStoreDao;
 import cn.estsh.i3plus.pojo.platform.bean.FactoryStore;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
@@ -26,7 +27,7 @@ public class FactoryStoreController {
     private Logger LOGGER = LoggerFactory.getLogger(this.getClass());
 
     @Autowired
-    private IDataMoreService dataMoreService;
+    private IFactoryStoreDao dataMoreService;
 
     @PostMapping(value="/insert/{name}/{code}")
     @ApiOperation(value="service服务",notes="返回内容添加service")
@@ -34,7 +35,7 @@ public class FactoryStoreController {
         FactoryStore fs = new FactoryStore();
         fs.setStoreName(name);
         fs.setStoreCode(code);
-        //dataMoreService.insertFactory(fs);
+//        dataMoreService.(fs);
 
         return new ResultBean(true,"工厂已保存");
     }
@@ -43,8 +44,8 @@ public class FactoryStoreController {
     @GetMapping(value="/list")
     @ApiOperation(value="查询服务",notes="返回列表")
     public ResultBean list(){
-        //List<FactoryStore> fsList = dataMoreService.listFactoryStoreMore();
+        List<FactoryStore> fsList = dataMoreService.listFactoryStore();
 
-        return new ResultBean(true);
+        return new ResultBean(true,"查询结果:" + fsList.size(),fsList);
     }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.core.apiservice.dao;
 
+import cn.estsh.i3plus.pojo.platform.bean.FactoryStore;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.core.apiservice.daoimpl;
 
 import cn.estsh.i3plus.core.apiservice.dao.IFactoryStoreDao;
+import cn.estsh.i3plus.pojo.platform.bean.FactoryStore;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;