Merge branch 'future/strokeList' into 'master'

Future/stroke list

See merge request hewei/Jumeirah!31

api-merchant/src/main/java/com/jumeirah/api/merchant/controller/MerchantSmsController.java

-package com.jumeirah.api.merchant.controller;
-
-import com.jumeirah.common.service.impl.MerchantSmsService;
-import io.geekidea.springbootplus.framework.common.api.ApiResult;
-import io.geekidea.springbootplus.framework.common.controller.BaseController;
-import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
-import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * APP用户 控制器
- *
- * @author wei
- * @since 2020-09-23
- */
-@Slf4j
-@RestController
-//@Module("api-app")
-@Api(value = "短信验证码", tags = {"APP短信验证码相关"},hidden = true)
-@RequestMapping("/merchant/sms/")
-public class MerchantSmsController extends BaseController {
-
-    @Autowired
-    private MerchantSmsService merchantSmsService;
-
-    /**
-     * 获取注册验证码
-     */
-    @GetMapping("/registerCode")
-    @OperationLog(name = "获取注册或登陆的验证码", type = OperationLogType.INFO)
-    @ApiOperation(value = "获取注册或登陆的验证码", response = Object.class, notes = "本地环境默认666666")
-    public ApiResult<Object> registerOrLoginCode(@RequestParam String phoneArea, @RequestParam String phone) throws Exception {
-
-        return merchantSmsService.registerCode(phoneArea, phone);
-    }
-
-}
-
+//package com.jumeirah.api.merchant.controller;
+//
+//import com.jumeirah.common.service.impl.MerchantSmsService;
+//import io.geekidea.springbootplus.framework.common.api.ApiResult;
+//import io.geekidea.springbootplus.framework.common.controller.BaseController;
+//import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
+//import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestParam;
+//import org.springframework.web.bind.annotation.RestController;
+//
+///**
+// * APP用户 控制器
+// *
+// * @author wei
+// * @since 2020-09-23
+// */
+//@Slf4j
+//@RestController
+////@Module("api-app")
+//@Api(value = "短信验证码", tags = {"APP短信验证码相关"},hidden = true)
+//@RequestMapping("/merchant/sms/")
+//public class MerchantSmsController extends BaseController {
+//
+//    @Autowired
+//    private MerchantSmsService merchantSmsService;
+//
+//    /**
+//     * 获取注册验证码
+//     */
+//    @GetMapping("/registerCode")
+//    @OperationLog(name = "获取注册或登陆的验证码", type = OperationLogType.INFO)
+//    @ApiOperation(value = "获取注册或登陆的验证码", response = Object.class, notes = "本地环境默认666666")
+//    public ApiResult<Object> registerOrLoginCode(@RequestParam String phoneArea, @RequestParam String phone) throws Exception {
+//
+//        return merchantSmsService.registerCode(phoneArea, phone);
+//    }
+//
+//}
+//

common/src/main/java/com/jumeirah/common/entity/CharterIntroduction.java

@@ -50,6 +50,9 @@ public class CharterIntroduction extends BaseEntity {
     @ApiModelProperty("包机文字")
     @ApiModelProperty("包机文字")
     private String text;
     private String text;
 
 
+    @ApiModelProperty("包机标题")
+    private String title;
+
     @ApiModelProperty("类型 1私人;2团体;3货运;4医疗")
     @ApiModelProperty("类型 1私人;2团体;3货运;4医疗")
     private Integer type;
     private Integer type;
 
 

common/src/main/java/com/jumeirah/common/entity/Stroke.java

@@ -168,8 +168,4 @@ public class Stroke extends BaseEntity {
     @ApiModelProperty("用户充值截图证据,  传入数组")
     @ApiModelProperty("用户充值截图证据,  传入数组")
     private String userRechargeCredentialsUrl;
     private String userRechargeCredentialsUrl;
 
 
-
-    @ApiModelProperty("备注")
-    private String remark;
-
 }
 }

common/src/main/java/com/jumeirah/common/vo/CharterIntroductionQueryForAppVo.java

@@ -31,6 +31,9 @@ public class CharterIntroductionQueryForAppVo implements Serializable {
     @ApiModelProperty("包机文字")
     @ApiModelProperty("包机文字")
     private String text;
     private String text;
 
 
+    @ApiModelProperty("包机标题")
+    private String title;
+
     @ApiModelProperty("图片高")
     @ApiModelProperty("图片高")
     private Integer imageListHeight;
     private Integer imageListHeight;
     @ApiModelProperty("图片宽")
     @ApiModelProperty("图片宽")

common/src/main/resources/mapper/CharterIntroductionMapper.xml

@@ -7,7 +7,7 @@
         id, mc_id, status, create_time, update_time,type,text,img_url,image_list_height,image_list_width
         id, mc_id, status, create_time, update_time,type,text,img_url,image_list_height,image_list_width
     </sql>
     </sql>
     <sql id="Base_Column_ListForApp">
     <sql id="Base_Column_ListForApp">
-        text,img_url,ci.image_list_height,ci.image_list_width,m.head AS mcHead,m.name AS mcName
+        title,text,img_url,ci.image_list_height,ci.image_list_width,m.head AS mcHead,m.name AS mcName
     </sql>
     </sql>
 
 
     <select id="getCharterIntroductionById" resultType="com.jumeirah.common.vo.CharterIntroductionQueryVo">
     <select id="getCharterIntroductionById" resultType="com.jumeirah.common.vo.CharterIntroductionQueryVo">