Merge branch 'master' into test

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -560,7 +560,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
                 // todo 内销合同实现逻辑
                 break;
             default:
-                throw new ServiceException("未知销售合同类型");
+                //未知合同类型默认当外销合同处理
+                setExportContractInfo(contractPdfInfoVo, contract);
+//                throw new ServiceException("未知销售合同类型");
         }
 
         return contractPdfInfoVo;