Merge branch 'master-prod-new' into master-stander

cmg

2024-05-27 fda19426ae69d31ce5bfa85c1f9c6d2e4ae3e54b

 phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockBackDto.java

@@ -35,7 +35,12 @@
    public static Integer OP_TYPE_EMPLOYEE = 1;
    /**操作人类型-用户*/
    public static Integer OP_TYPE_USER = 2;
    /**操作人类型*/
    /**操作人类型-管理员*/
    public static Integer OP_TYPE_ADMIN = 3;

    /**类型：出库单退回*/
    public static Integer COMMON_TYPE_OUT = 0;
    /**类型：入库单退回*/
    public static Integer COMMON_TYPE_IN = 1;

}