|
@@ -52,7 +52,7 @@ public class GroupController {
|
|
|
APIResult<MerchantVo> merchantVoAPIResult = merchantService.getMerchant(merchantId);
|
|
|
if (merchantVoAPIResult.getSuccess()) {
|
|
|
MerchantVo merchantVo = merchantVoAPIResult.getData();
|
|
|
- String code = groupDTO.getCode() + "_" + merchantVo.getSimple();
|
|
|
+ String code = merchantVo.getSimple() + "_" + groupDTO.getCode();
|
|
|
groupDTO.setCode(code.toUpperCase());
|
|
|
}else {
|
|
|
return APIResult.error(new BaseCode(merchantVoAPIResult.getCode(), merchantVoAPIResult.getMessage()));
|