Merge remote-tracking branch 'origin/master'

aijinhui

2023-09-12 61c0c3ccae4c23a90c405d7ac1cb49f7d5ee0479

 ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -11,11 +11,10 @@
import com.ruoyi.common.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
    #if($table.sub)
    import java.util.ArrayList;

    import com.ruoyi.common.utils.StringUtils;
    import com.ruoyi.common.utils.SecurityUtils;
    #if($table.sub)
    import org.springframework.transaction.annotation.Transactional;
    import ${packageName}.domain.${subClassName};
    #end