Merge branch 'master' of https://mc.cloudpure.cn/mjava/cont

mjava-junengtai/src/main/java/com/malk/junengtai/service/Impl/PurchaseServiceImpl.java

@@ -151,7 +151,7 @@ public class PurchaseServiceImpl implements PurchaseService {
                 Map<String, String> partData = new HashMap<>();
                 partData.put("supplierCode", partNode.get("supplierCode").asText());
                 partData.put("name", partNode.get("name").asText());
-
+                partData.put("createDate",partNode.get("createDate").isNull() ? "" : partNode.get("createDate").asText());
                 List.add(partData);
                 partsMap.put(partNode.get("supplierCode").asText(), partData);
             }

mjava-junengtai/src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: dev
+    active: prod