jz.kai 3 yıl önce
ebeveyn
işleme
4a0f526653

+ 1 - 0
common/src/main/resources/mapper/base/Commodity.xml

@@ -100,6 +100,7 @@ id_,catalogues_id,product_model,product_icon,product_content,product_picture,pro
 			select * from base_commodity
 		]]>
 		<where>
+			and del_flag = 0
 			<if test="searchParams.cataloguesId != null">
 				and catalogues_id = #{searchParams.cataloguesId}
 			</if>

+ 5 - 2
web/src/main/resources/application-dev.yml

@@ -5,9 +5,12 @@ server:
 
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/heyi_machinery?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/heyi_machinery?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#    username: root
+#    password: jpsoft2016
+    url: jdbc:log4jdbc:mysql://47.101.158.176:3306/heyi_machinery?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
-    password: jpsoft2016
+    password: jpsoft2022
   devtools:
     add-properties: false
     restart: