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

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java

@@ -171,7 +171,7 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain
             }
 
             //原逻辑这边会调用创建民生诉求工单,接口会做后续安排
-           /* List<String> proCodeList = new ArrayList<>();
+            List<String> proCodeList = new ArrayList<>();
             // 创建民生诉求工单
             if(StringUtils.isNotEmpty(bo.getComplaintItemCodes())){
                 List<String> codes = Arrays.asList(Convert.toStrArray(bo.getComplaintItemCodes()));
@@ -181,7 +181,7 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain
                 });
             }
             //投诉工单返回参数
-            bo.setProWoCode(String.join(",",proCodeList));*/
+            bo.setProWoCode(String.join(",",proCodeList));
 
             EnterpriseComplaint updateEntity = MapstructUtils.convert(bo, EnterpriseComplaint.class);
             baseMapper.updateById(updateEntity);