Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev_member_voucher_refund

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/ClientAdminApplication.java

@@ -18,7 +18,7 @@ import java.util.Arrays;
 @EnableAsync
 @EnableEurekaClient
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.liquidnet"})
-@MapperScan(basePackages = {"com.liquidnet.service.kylin.mapper", "com.liquidnet.service.adam.mapper"})//
+@MapperScan(basePackages = {"com.liquidnet.service.*.mapper"})
 public class ClientAdminApplication implements CommandLineRunner {
     @Autowired
     private Environment environment;

liquidnet-bus-do/liquidnet-service-candy-do/src/main/resources/com/liquidnet/service/candy/mapper/CandyMgtCouponMapper.xml

@@ -43,10 +43,6 @@
         <!--        <result column="comment" jdbcType="VARCHAR" property="comment" />-->
     </resultMap>
 
-    <sql id="Rst_MgtCouponInfoDto_Column_List">
-
-    </sql>
-
     <select id="selectMultiForMgtCouponInfoDto" resultMap="Rst_MgtCouponInfoDto">
         SELECT cc.coupon_id,
                cc.title,
@@ -82,6 +78,7 @@
                cmc.updated_at
         FROM candy_mgt_coupon cmc
                  LEFT JOIN candy_coupon cc ON cmc.coupon_id = cc.coupon_id
-        WHERE cmc.state <![CDATA[<>]] 2
-        ORDER BY cmc.created_at DESC </
-        select> </mapper>
+        WHERE cmc.state <![CDATA[<>]]> 2
+        ORDER BY cmc.created_at DESC
+    </select>
+</mapper>
\ No newline at end of file