供应商

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -769,7 +769,10 @@
                t.make_staff,
                makestaff.staff_name                              as "makeStaffName",
                t.make_time,
-               t.cp_id
+               t.cp_id,
+               t.discount,
+               t.fact_amt,
+               t.disc_amt
         FROM dkic_b.t_psi_order as t
                  left join dkic_b.t_mst_sale_channel tmsc on t.sales_channel = tmsc.channel_id
                  left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id

src/main/resources/dev/bootstrap.yml

@@ -2,7 +2,7 @@ server:
   port: 7008
 spring:
   application:
-    name: mdm-server-dkic-b1
+    name: mdm-server-dkic-b1-wyj
   profiles:
     active: @environment@
   cloud:
@@ -65,7 +65,7 @@ spring:
       max-file-size: 10MB
 
 logback:
-  file: D:\data\DK_IBOSS_MINI
+  file: F:\data\DK_IBOSS_MINI
 
 feign:
   sentinel:
@@ -160,7 +160,7 @@ pdf-folder: C:\Users\admin\Desktop\pdf\
 #  自定义报表导出sql文件路径
 custom-report-sql: C:\Users\admin\Desktop\custom-report-sql.sql
 ####apk文件夾
-apk-folder: D:\download\
+apk-folder: F:\download\
 ####原生android-webiview
 apk-file-name: app-debug.apk
 apk-version: 23.05.10.01
@@ -171,7 +171,7 @@ apk-version-smtt: 23.05.10.01
 apk-file-name-crosswalk: app-debug-crosswalk.apk
 apk-version-crosswalk: 23.05.10.01
 
-excel-folder: D:\data\DK_MES\excel\
+excel-folder: F:\data\DK_MES\excel\
 
 #文件上传
-upload-path: D:/upload
+upload-path: F:/upload