Merge remote-tracking branch 'origin/master'

Junjie

2023-12-30 ba94aa39ae925d9021b0ca13ca0b11dd6843656b

 zy-asrs-framework/src/main/resources/templates/Mapper.txt

@@ -1,7 +1,7 @@
package @{COMPANYNAME}.mapper;

import @{COMPANYNAME}.entity.@{ENTITYNAME};
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;