Merge branch 'dev/2024/0409/update-diy-template' of Harper/feifan-backend-zx-admin into master

解决平台端商户模板打开报异常

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/dal/dataobject/diy/DiyTemplateDO.java

@@ -63,6 +63,6 @@ public class DiyTemplateDO extends BaseDO {
 
     private Long shopId;
 
-    private Long merId;
+    private Long merchantId;
 
 }