Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/sm/smspu/SmSpuEditVo.java

@@ -112,4 +112,7 @@ public class SmSpuEditVo {
      */
     @Schema(description="租户编号")
     private Long tenantId;
+
+    @Schema(description="商户id")
+    private  Long merchantId;
 }