Merge branch 'dev-zza' into dev

jsowell-pile/src/main/java/com/jsowell/pile/domain/PileMerchantInfo.java

@@ -87,6 +87,11 @@ public class PileMerchantInfo extends BaseEntity {
 	@Excel(name = "logo")
 	private String logoUrl;
 
+	/**
+	 * 营业执照url
+	 */
+	private String businessLicenseUrl;
+
 	/**
 	 * 运营商的小程序appId
 	 */
@@ -129,6 +134,7 @@ public class PileMerchantInfo extends BaseEntity {
 				.append("managerPhone", getManagerPhone())
 				.append("servicePhone", getServicePhone())
 				.append("logoUrl", getLogoUrl())
+				.append("businessLicenseUrl", getBusinessLicenseUrl())
 				.append("createBy", getCreateBy())
 				.append("createTime", getCreateTime())
 				.append("updateBy", getUpdateBy())

jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateMerchantDTO.java

@@ -62,6 +62,11 @@ public class CreateMerchantDTO {
      */
     private String logoUrl;
 
+    /**
+     * 运营商营业执照url
+     */
+    private String businessLicenseUrl;
+
     /**
      * 运营商的小程序appId
      */