fix conflect

Helius

2022-07-05 b95699652357c6218b45eceb81170ddfebb30e1d

 src/main/java/com/xcong/farmer/cms/common/exception/GlobalException.java

@@ -1,4 +1,4 @@
package com.xcong.excoin.common.exception;
package com.xcong.farmer.cms.common.exception;

import lombok.Getter;