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

Junjie

2023-09-14 2a8710c50e2f7c4dd0e333dcf650a2dff960fff4

 src/main/java/com/zy/crm/manager/controller/PriQuoteController.java

@@ -129,6 +129,7 @@
        priQuote.setTitle(map.get("title").toString());
        priQuote.setTemplateName(priQuoteBudget.getTemplateName());
        priQuote.setSheetData(map.get("sheetData").toString());
        priQuote.setOriQuoteBudgetId(Long.parseLong(map.get("priQuoteBudgetId").toString()));
        priQuote.setItemId(priQuoteBudget.getItemId());
        priQuote.setOrderNum(priQuoteBudget.getInOrderNum());
        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");