312环境

src/main/resources/application.yml

@@ -10,7 +10,7 @@ server:
 spring:
   # 环境 dev|test|pro
   profiles:
-    active: dev
+    active: dev312
   application:
     name: hmhj
   # 模板引擎配置

src/main/resources/mapper/hmhj/EntrustSampleMapper.xml

@@ -5,7 +5,7 @@
     <select id="selectSampleReceiveList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleVO">
 
        SELECT
-	    p.id,s.code,s.name,p.group_id,p.group_name,p.make_type,p.make_quantity,p.store_way,p.store_location,p.maker,p.make_time
+	    p.id, p.entrust_sample_id,s.code,s.name,p.group_id,p.group_name,p.make_type,p.make_quantity,p.store_way,p.store_location,p.maker,p.make_time
       FROM
 	  entrust_sample_prepare
 	  P JOIN entrust_sample s ON P.entrust_sample_id = s.ID