Merge branch 'feature/20260313-category' of AHX-Bid/tzy-admin into dev

py-goods/src/main/resources/mapper/SpuCategoryMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.poyee.mapper.SpuCategoryMapper">
 
     <sql id="spuCategoryQuery">
-        select id,category_name categoryName,is_cascade isCascade, sub_label subLabel,sort,parent_id parentId,icon_url iconUrl,status,create_time createTime,update_time updateTime from spu_category
+        select id,category_name,is_cascade, sub_label,sort,parent_id,icon_url,status,create_time,update_time from spu_category
     </sql>
     <select id="querySpuCategory" resultType="spuCategoryDto">
         <include refid="spuCategoryQuery"></include>

py-starter/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ spring:
         master:
           type: com.alibaba.druid.pool.DruidDataSource
           driver-class-name: org.postgresql.Driver
-          url: ${SLAVE_DATASOURCE_URL:jdbc:postgresql://192.168.50.8:5432/ahx_auction}
+          url: ${SLAVE_DATASOURCE_URL:jdbc:postgresql://192.168.50.8:5432/ahx_app}
           username: ${SLAVE_DATASOURCE_USERNAME:postgres}
           password: ${MASTER_DATASOURCE_PASSWORD:123456}
 #          url: ${MASTER_DATASOURCE_URL:jdbc:postgresql://192.168.50.10:25432/hs_sync_data}