fix 修复升级合并错误

疯狂的狮子li

2021-07-12 cd34c87afa730c48e2b2be61d700b1fee409e02c

 ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java

@@ -1,20 +1,20 @@
package com.ruoyi.common.enums;



/**

 * 操作状态

 * 
 * @author ruoyi

 *

 */

public enum BusinessStatus

{

    /**

     * 成功

     */

    SUCCESS,



    /**

     * 失败

     */

    FAIL,

}

package com.ruoyi.common.enums;

/**
 * 操作状态
 * 
 * @author ruoyi
 *
 */
public enum BusinessStatus
{
    /**
     * 成功
     */
    SUCCESS,

    /**
     * 失败
     */
    FAIL,
}