Merge remote-tracking branch 'origin/master'

src/main/resources/application-pro.yml

@@ -48,3 +48,8 @@ UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
 
+back_file_path: D:/share/udisps/back/
+API_KEY: 1101
+API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L
+
+

src/main/resources/mybatis/mapper/inout/ReceiveDao.xml

@@ -41,7 +41,7 @@
                 AND status = #{status}
             </if>
             <if test="type == 1">
-                AND (status=1 or status=2)
+                AND (status=1 or status=2 or status=4)
             </if>
             <if test="type == 2">
                 AND (status=2)