diff --git a/youchain-system/src/main/java/com/youchain/basicdata/domain/Area.java b/youchain-system/src/main/java/com/youchain/basicdata/domain/Area.java index e82c556..14077d7 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/domain/Area.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/domain/Area.java @@ -113,15 +113,15 @@ public class Area extends BaseEntity implements Serializable { @Column(name = "`bexb`") @ApiModelProperty(value = "线边接收") - private Boolean bexb; + private Boolean bexb=false; @Column(name = "`besh`") @ApiModelProperty(value = "收货仓库") - private Boolean besh; + private Boolean besh=true; @Column(name = "`bezz`") @ApiModelProperty(value = "制造库位耗用") - private Boolean bezz; + private Boolean bezz=false; @Column(name = "`shdd`") @ApiModelProperty(value = "收货担当") diff --git a/youchain-system/src/main/resources/config/application-dev.yml b/youchain-system/src/main/resources/config/application-dev.yml index b44df7f..eec6774 100644 --- a/youchain-system/src/main/resources/config/application-dev.yml +++ b/youchain-system/src/main/resources/config/application-dev.yml @@ -4,7 +4,7 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:47.103.100.52}:${DB_PORT:53306}/${DB_NAME:kams4_prod}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false + url: jdbc:log4jdbc:mysql://${DB_HOST:47.103.100.52}:${DB_PORT:53306}/${DB_NAME:zw_kams4}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false username: ${DB_USER:root} password: ${DB_PWD:Youchain@56} # 初始连接数 diff --git a/youchain-system/src/main/resources/config/application.yml b/youchain-system/src/main/resources/config/application.yml index 1651e1e..f79b943 100644 --- a/youchain-system/src/main/resources/config/application.yml +++ b/youchain-system/src/main/resources/config/application.yml @@ -7,8 +7,8 @@ spring: freemarker: check-template-location: false profiles: - active: prod - #active: dev + #active: prod + active: dev jackson: time-zone: GMT+8 data: