Explorar el Código

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

release_toaliyun_real
luozukai hace 6 años
padre
commit
e51aac337a
Se han modificado 2 ficheros con 2 adiciones y 1 borrados
  1. +1
    -0
      mallinkAdmin/src/main/resources/db/migration/V201907241543__G_ALTER_SHOP.sql
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxShop.java

+ 1
- 0
mallinkAdmin/src/main/resources/db/migration/V201907241543__G_ALTER_SHOP.sql Ver fichero

@@ -0,0 +1 @@
alter table wx_shop modify `rent` varchar(20) DEFAULT '' COMMENT '参与租金';

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxShop.java Ver fichero

@@ -126,7 +126,7 @@ public class WxShop extends BaseEntity {
private Integer freeDay; private Integer freeDay;


@io.swagger.annotations.ApiModelProperty(value = "参考租金", name = "rent") @io.swagger.annotations.ApiModelProperty(value = "参考租金", name = "rent")
private Integer rent;
private String rent;


@io.swagger.annotations.ApiModelProperty(value = "预置业态", name = "businessId") @io.swagger.annotations.ApiModelProperty(value = "预置业态", name = "businessId")
private Long businessId; private Long businessId;


Cargando…
Cancelar
Guardar