Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs

whycq

2024-05-27 cb1db468bcaa90e9a0e2e4aee192088e9370ac52

 zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java

@@ -158,4 +158,7 @@
    //存货核算
    private String inventoryAccount;

    //商品分类
    private String shopCategory;

}