@@ -184,6 +184,9 @@
<properties>
<env>local</env>
</properties>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
</profile>
<profile>
<id>dev</id>
@@ -202,9 +205,6 @@
<env>prod</env>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
</profiles>
<build>
@@ -1,5 +1,5 @@
server:
- port: 9100
+ port: 8090
spring:
application:
@@ -7,7 +7,7 @@ spring:
datasource:
driver-class-name: com.mysql.jdbc.Driver
password: Ccj841968545
- url: jdbc:mysql://47.100.3.209:3306/ylyy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://47.100.3.209:3306/yiliangyiyun_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
username: root
redis:
database: 0
@@ -121,6 +121,14 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
* 是否显示
*/
private String showFlag;
+ /**
+ * 监控url1
+ */
+ private String monitorUrl1;
+ * 监控url2
+ private String monitorUrl2;
/**
* 应余量
@@ -119,7 +119,7 @@
AND status != '全部付款'
</if>
<if test="searchType == 6">
- AND status == '全部付款'
+ AND status = '全部付款'
<if test="managementType != null and managementType != ''">