Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-service

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/mapper/xml/SyCapacityControlMapper.xml

@@ -4,7 +4,7 @@
 
     <insert id="insert" parameterType="org.jeecg.modules.capacity.entity.SyCapacityControl">
         insert sy_capacity_control  (supplier,supplier_code,capacity_quota,working_hours,capacity_section,supplier_state,remarks,state)
-        values (#{entity.supplier},#{entity.supplier_code},#{entity.capacity_quota},#{entity.working_hours},#{entity.capacity_section},
-                #{entity.supplier_state},#{entity.remarks},#{entity.state});
+        values (#{entity.supplier},#{entity.supplierCode},#{entity.capacityQuota},#{entity.workingHours},#{entity.capacitySection},
+                #{entity.supplierState},#{entity.remarks},#{entity.state});
     </insert>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/service/impl/SyCapacityControlServiceImpl.java

@@ -5,6 +5,7 @@ import org.jeecg.modules.capacity.entity.SyCapacityControl;
 import org.jeecg.modules.capacity.mapper.SyCapacityControlMapper;
 import org.jeecg.modules.capacity.service.ISyCapacityControlService;
 import org.jeecg.modules.openApi.service.ISenYuDataSourceThree;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -19,6 +20,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @DS("multi-three")
 public class SyCapacityControlServiceImpl extends ServiceImpl<SyCapacityControlMapper, SyCapacityControl> implements ISyCapacityControlService {
 
+    @Autowired
     private  SyCapacityControlMapper syCapacityControlMapper;
 
     @Override