Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java

@@ -381,7 +381,7 @@ public class WhiteController extends CoreBaseController {
      */
     @PostMapping(value = "/sys-label-template/list")
     @ApiOperation(value = "查询全部打印模板",notes = "查询全部打印模板")
-    public ResultBean findSysConfigAll(@RequestBody SysLabelTemplate template){
+    public ResultBean<SysLabelTemplate> findSysConfigAll(@RequestBody SysLabelTemplate template){
         try {
             List<SysLabelTemplate> sysLabelTemplateList = sysLabelTemplateService.listSysLabelTemplateDetail(template);;
             return  ResultBean.success("操作成功")

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java

@@ -160,7 +160,7 @@ public class SysLabelTemplateService implements ISysLabelTemplateService {
             if(paramList != null && paramList.size() > 0){
                 for (SysLabelTemplateParam param : paramList) {
                     for (SysLabelTemplate temp : list) {
-                        if(temp.getId().equals(param.getId())){
+                        if(temp.getId().equals(param.getTemplateId())){
                             List<SysLabelTemplateParam> params = temp.getLabelTemplateParamList();
                             if(params == null){
                                 params = new ArrayList<>();