Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/resources/config/mybatis/SubjectChangeMapper.xml

@@ -71,11 +71,11 @@
         order_no_,trans_no_,status_,sell_time_, create_time_, update_time,version_)
         values (#{studentId},#{organId},#{cooperationOrganId},#{musicGroupId},#{originalCourseFee}, #{originalMusical},
         #{originalMusicalPrice},
-        #{originalAccessories}, #{originalAccessoriesPrice},#{originalCost},#{kitGroupPurchaseType},#{changeCourseFee},
+        #{originalAccessories}, #{originalAccessoriesPrice},#{originalCost},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{changeCourseFee},
         #{changeMusical},
         #{changeMusicalPrice}, #{changeAccessories}, #{changeAccessoriesPrice},#{changeCost}, #{goodsMargin},
         #{courseMargin},#{costMargin}
-        #{sellAmount},#{orderId},#{orderNo},#{transNo},#{status},#{sellTime}, #{createTime}, #{updateTime},0)
+        #{sellAmount},#{orderId},#{orderNo},#{transNo},#{status},#{sellTime}, #{createTime}, #{updateTime},#{version})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.SubjectChange">
         <!--@mbg.generated-->

mec-web/src/main/java/com/ym/mec/web/controller/SubjectChangeController.java

@@ -48,7 +48,7 @@ public class SubjectChangeController extends BaseController {
 
     @ApiOperation("销售列表")
     @GetMapping(value = "/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('sellOrder/queryPage')")
+    @PreAuthorize("@pcs.hasPermissions('subjectChange/queryPage')")
     public HttpResponseResult<PageInfo<SubjectChange>> queryPage(SubjectChangeQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {