add field of merchant simple

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/product/GroupController.java

@@ -41,6 +41,9 @@ public class GroupController {
 
     @RequestMapping(method = RequestMethod.POST)
     public APIResult<GroupVo> create(@Valid @RequestBody GroupDTO groupDTO) {
+        // 转大写
+        String code = groupDTO.getCode();
+        groupDTO.setCode(code.toUpperCase());
         APIResult<GroupVo> groupVoAPIResult = groupService.create(groupDTO);
         if (groupVoAPIResult.getSuccess()) {
             merchantInfoSetService.setMerchantInfo(groupVoAPIResult.getData());

rankin-data-api/src/main/java/cn/rankin/data/api/user/dto/MerchantDTO.java

@@ -17,6 +17,8 @@ public class MerchantDTO implements Serializable{
 
     private String code;
 
+    private String simple;
+
     private String name;
 
     private String licenseId;

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/Merchant.java

@@ -36,6 +36,8 @@ public class Merchant implements Serializable {
 
     private String name;
 
+    private String simple;
+
     @Column(name = "contact_name")
     private String contactName;
 

rankin-data-api/src/main/java/cn/rankin/data/api/user/vo/MerchantVo.java

@@ -20,6 +20,8 @@ public class MerchantVo implements Serializable {
 
     private String code;
 
+    private String simple;
+
     private String name;
 
     private String contactName;