Merge branch 'cpq-dev' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/controller/AdwebSiteManageController.java

@@ -213,6 +213,8 @@ public class AdwebSiteManageController extends JeecgController<AdwebSite, IAdweb
         log.info("siteOrderPost:{}", siteOrderPost);
         if (siteOrderPost != null) {
             resultMap.put("orderUrl", siteOrderPost.getOrderUrl() + "&master=" + (adwebSiteManageService.hasSub(loginUser) ? 1 : 0) + "&username=" + loginUser.getUsername() + "&time=" + DateUtil.getDate().getTime());
+            resultMap.put("orderInitUrl", siteOrderPost.getOrderUrl());
+            resultMap.put("orderID", siteOrderPost.getId());
             return Result.OK(resultMap);
         }